[POLICY-8] cleaned up unused code
Change-Id: Ifebf67db574e1c4eadf9d50ca0f178ab7ddba033
Signed-off-by: Jorge Hernandez <jh1730@att.com>
diff --git a/packages/base/pom.xml b/packages/base/pom.xml
index 3009b85..47486bf 100644
--- a/packages/base/pom.xml
+++ b/packages/base/pom.xml
@@ -33,7 +33,7 @@
<packaging>pom</packaging>
<name>Base Package</name>
- <description>D2 ECOMP Policy Drools PDP Packaging</description>
+ <description>ONAP Policy Drools PDP Packaging</description>
<build>
<plugins>
@@ -82,7 +82,7 @@
<executable>/bin/bash</executable>
<arguments>
<argument>-c</argument>
- <argument>mkdir -p target ; echo -e 'version="${project.version}"\ndescription="Open ECOMP Drools PDP"\nbuildTag="'"${BUILD_TAG}"'"\ncommit="'"${GIT_COMMIT}"'"\ntimestamp="${maven.build.timestamp}"' >target/build.info</argument>
+ <argument>mkdir -p target ; echo -e 'version="${project.version}"\ndescription="ONAP Drools PDP"\nbuildTag="'"${BUILD_TAG}"'"\ncommit="'"${GIT_COMMIT}"'"\ntimestamp="${maven.build.timestamp}"' >target/build.info</argument>
</arguments>
</configuration>
</execution>
diff --git a/packages/base/src/files/bin/db_upgrade_droolspdp.sh b/packages/base/src/files/bin/db_upgrade_droolspdp.sh
deleted file mode 100644
index 382b3b2..0000000
--- a/packages/base/src/files/bin/db_upgrade_droolspdp.sh
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/bin/bash
-
-###
-# ============LICENSE_START=======================================================
-# ONAP POLICY
-# ================================================================================
-# Copyright (C) 2017 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=========================================================
-###
-
-#
-# db_upgrade_droolspdp.sh: Run this script to upgrade drools database to a given release level,
-# it is recommended that you switch to the policy user to run this script
-#
-# Usage : db_upgrade_droolspdp.sh target_db_release_level db_user_id db_user_password
-# Example: db_upgrade_droolspdp.sh 151000 policy_user password
-#
-# Assumption: 1. DB upgrade sql script in $POLICY_HOME/data/mysql folder with read permission
-# 2. DB user has privilege to create/drop/alter database table
-#
-# Note: The default location for db release script is $POLICY_HOME/data/mysql
-# The release level is represented as Two-digit-Year+Two-digit-Month+two-digit-Sub-release (151000, 151001)
-# Drools database version is represented by record with the_key of 'DROOLS_VERSION'
-#
-
-TARGET_RELEASE=""
-CURRENT_RELEASE=""
-DB_UPGRADE_USER=""
-DB_UPGRADE_PASSWORD=""
-DB_UPGRADE_DIR=$POLICY_HOME/data/mysql
-DATE=`date +"%Y%m%d%H%M%S"`
-LOG=""
-ERR=""
-
-function get_current_release_level
-{
- echo "Get current release level started ...@`date`" | tee -a $LOG
- # display output vertical
- query="select version from support.db_version where the_key = 'DROOLS_VERSION' \G"
- CURRENT_RELEASE=`${MYSQL} --skip-column-names --execute "${query}" 2>$ERR | grep -v "*"`
- echo "CURRENT_RELEASE: [$CURRENT_RELEASE]" | tee -a $LOG
- echo "Get current release level completed ...@`date`" | tee -a $LOG
-}
-
-function evaluate_upgrade_downgrade
-{
- echo "CURRENT_RELEASE --> [$CURRENT_RELEASE]" | tee -a $LOG
- echo "TARGET_RELEASE --> [$TARGET_RELEASE] " | tee -a $LOG
- if [[ "${CURRENT_RELEASE}" < "${TARGET_RELEASE}" ]]; then
- # perform db upgrade
- UPGRADE_LIST=/tmp/db_upgrade_droolspdp_list.$$
- find ${DB_UPGRADE_DIR} -name "*_upgrade_script.sql" 2>/dev/null | grep "droolspdp" | sort > $UPGRADE_LIST
- while read -r file
- do
- RELEASE=`basename $file | cut -d'_' -f1`
- #echo "[$RELEASE] [$TARGET_RELEASE]" | tee -a $LOG
- if [ "${RELEASE}" -gt "${CURRENT_RELEASE}" ] && [ "${RELEASE}" -le "${TARGET_RELEASE}" ]; then
- run_script "UPGRADE" "${file}" 2>&1 | tee -a $LOG
- fi
- done < $UPGRADE_LIST
- rm -f $UPGRADE_LIST
- set_current_release_level $TARGET_RELEASE
- elif [[ "${CURRENT_RELEASE}" > "${TARGET_RELEASE}" ]]; then
- # perform db downgrade
- DOWNGRADE_LIST=/tmp/db_downgrade_list.$$
- find ${DB_UPGRADE_DIR} -name "*_downgrade_script.sql" 2>/dev/null | grep "droolspdp" | sort -r > $DOWNGRADE_LIST
- while read -r file
- do
- RELEASE=`basename $file | cut -d'_' -f1`
- #echo "[$RELEASE] [$TARGET_RELEASE]" | tee -a $LOG
- if [ "${RELEASE}" -le "${CURRENT_RELEASE}" ] && [ "${RELEASE}" -gt "${TARGET_RELEASE}" ]; then
- run_script "DOWNGRADE" "${file}"
- fi
- done < $DOWNGRADE_LIST
- rm -f $DOWNGRADE_LIST
- set_current_release_level $TARGET_RELEASE
- else
- echo "CURRENT DB RELEASE LEVEL THE SAME AS TARGET RELEASE LEVEL, NO ACTION TAKEN ..." | tee -a $LOG
- fi
-}
-
-function run_script
-{
- action="${1}"
- script="${2}"
- echo "Perform DB $action use $script ..." | tee -a $LOG
- echo "--" | tee -a $LOG
- ${MYSQL} --verbose < "${script}" 2>$ERR | tee -a $LOG
- echo "--" | tee -a $LOG
-}
-
-function set_current_release_level
-{
- RELEASE="${1}"
- echo "Set current release level to [$RELEASE] started ...@`date`" | tee -a $LOG
- update_statement="insert into support.db_version (the_key, version) values ('DROOLS_VERSION', '${RELEASE}') on duplicate key update version='${RELEASE}';"
- ${MYSQL} --execute "${update_statement}"
-
- echo "" | tee -a $LOG
- echo "CURRENT_RELEASE set to: [$RELEASE]" | tee -a $LOG
- echo "" | tee -a $LOG
- echo "Set current release level completed ...@`date`" | tee -a $LOG
-}
-
-function check_directory
-{
- if [ ! -d $DB_UPGRADE_DIR ]; then
- echo "ERROR, DIRECTORY NOT EXIST: $DB_UPGRADE_DIR, PROCESS EXIT ..."
- exit;
- else
- if [ ! -d $DB_UPGRADE_DIR/logs ]; then
- mkdir $DB_UPGRADE_DIR/logs
- fi
- fi
-}
-
-# MAIN
-#check_directory
-LOG=$POLICY_HOME/logs/db_upgrade_droolspdp_$DATE.log
-ERR=$POLICY_HOME/logs/db_upgrade_droolspdp_$DATE.err
-echo "db_upgrade_droolspdp.sh started ..." | tee -a $LOG
-if [ $# -eq 3 ]; then
- TARGET_RELEASE="${1}"
- DB_UPGRADE_USER="${2}"
- DB_UPGRADE_PASSWORD="${3}"
- echo "TARGET_RELEASE : $TARGET_RELEASE" | tee -a $LOG
- echo "DB_UPGRADE_USER: $DB_UPGRADE_USER" | tee -a $LOG
- echo "DB_UPGRADE_DIR : $DB_UPGRADE_DIR" | tee -a $LOG
- #
- if [ ${#TARGET_RELEASE} -ne 6 ]; then
- echo "ERROR, TARGET_RELEASE MUST BE 6 DIGITS: $TARGET_RELEASE" | tee -a $LOG | tee -a $ERR
- else
- typeset -r MYSQL="mysql -u${DB_UPGRADE_USER} -p${DB_UPGRADE_PASSWORD} ";
- get_current_release_level
- evaluate_upgrade_downgrade
- fi
-else
- echo "Usage : db_upgrade_droolspdp.sh target_release_level db_user_id db_user_password" | tee -a $LOG
- echo "Example: db_upgrade_droolspdp.sh 151000 policy_user password" | tee -a $LOG
-fi
-
-echo "db_upgrade_droolspdp.sh completed ..." | tee -a $LOG
diff --git a/packages/base/src/files/bin/db_upgrade_droolspdp_remote.sh b/packages/base/src/files/bin/db_upgrade_droolspdp_remote.sh
deleted file mode 100644
index fd8eb54..0000000
--- a/packages/base/src/files/bin/db_upgrade_droolspdp_remote.sh
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/bin/bash
-
-###
-# ============LICENSE_START=======================================================
-# ONAP POLICY
-# ================================================================================
-# Copyright (C) 2017 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=========================================================
-###
-
-#
-# db_upgrade_droolspdp_remote.sh: This script is to perform database schema upgrade on remote db,
-# no shecma downgrade will be performed in case db_version is higher then target_version
-#
-# Logic: 1. Get target schema version from db scripts in $POLICY_HOME/data/mysql
-# 2. Get current db schema version from support.db_version table (of target system)
-# 3. Apply db upgrade script in order if target_version is HIGHER than db_version
-# 4. Print out warning message if target_version is LOWER than db_version
-# 4. Print out message if target_version is EQUAL to db_version
-#
-#
-# Usage : db_upgrade_droolspdp_remote.sh db_user_id db_user_password hostname
-# Example: db_upgrade_droolspdp_remote.sh policy_user password policydb
-#
-# Assumption: 1. DB schema upgrade script in $POLICY_HOME/data/mysql folder with read permission
-# 2. DB user has privilege to create/drop/alter database table
-#
-# Note: The default location for db schema upgrade script is $POLICY_HOME/data/mysql
-# The release level is represented as Two-digit-Year+Two-digit-Month+two-digit-Sub-release (151000, 151001)
-#
-#
-
-TARGET_SCHEMA_VERSION=""
-CURRENT_SCHEMA_VERSION=""
-DB_UPGRADE_USER=""
-DB_UPGRADE_PASSWORD=""
-DB_HOSTNAME=""
-DB_UPGRADE_DIR=$POLICY_HOME/data/mysql
-DATE=`date +"%Y%m%d%H%M%S"`
-LOG=""
-ERR=""
-
-function get_current_schema_version
-{
- echo "Get current schema version from [${DB_HOSTNAME}] started ...@`date`" | tee -a $LOG
- # display output vertical
- query="select version from support.db_version where the_key = 'DROOLS_VERSION' \G"
- CURRENT_SCHEMA_VERSION=`${MYSQL} --skip-column-names --execute "${query}" 2>$ERR | grep -v "*"`
- error_msg=`cat $ERR | grep "doesn't exist"`
- if [ "${error_msg}" != "" ]; then
- echo "Create support.db_version table ..." | tee -a $LOG
- sql="create table support.db_version(the_key varchar(20) not null, version varchar(20), primary key(the_key));"
- ${MYSQL} --execute "${sql}"
- CURRENT_SCHEMA_VERSION="00"
- fi
- echo "CURRENT_SCHEMA_VERSION: [$CURRENT_SCHEMA_VERSION]" | tee -a $LOG
- echo "Get current schema version from [${DB_HOSTNAME}] completed ...@`date`" | tee -a $LOG
-}
-
-function get_target_schema_version
-{
- UPGRADE_LIST=/tmp/db_upgrade_list.$$
- find ${DB_UPGRADE_DIR} -name "*_upgrade_script.sql" 2>/dev/null | grep "droolspdp" | sort -r | head -1 > $UPGRADE_LIST
- while read -r file
- do
- TARGET_SCHEMA_VERSION=`basename $file | cut -d'_' -f1`
- echo "TARGET_SCHEMA_VERSION: [$TARGET_SCHEMA_VERSION]" | tee -a $LOG
- break
- done < $UPGRADE_LIST
- rm -f $UPGRADE_LIST
-}
-
-function evaluate_upgrade_downgrade
-{
- echo "CURRENT_SCHEMA_VERSION --> [$CURRENT_SCHEMA_VERSION]" | tee -a $LOG
- echo "TARGET_SCHEMA_VERSION --> [$TARGET_SCHEMA_VERSION] " | tee -a $LOG
- if [[ "${CURRENT_SCHEMA_VERSION}" < "${TARGET_SCHEMA_VERSION}" ]]; then
- # perform db upgrade
- UPGRADE_LIST=/tmp/db_upgrade_list.$$
- find ${DB_UPGRADE_DIR} -name "*_upgrade_script.sql" 2>/dev/null | grep "droolspdp" | sort > $UPGRADE_LIST
- while read -r file
- do
- DB_VERSION=`basename $file | cut -d'_' -f1`
- #echo "[$DB_VERSION] [$TARGET_SCHEMA_VERSION]" | tee -a $LOG
- if [ "${DB_VERSION}" -gt "${CURRENT_SCHEMA_VERSION}" ] && [ "${DB_VERSION}" -le "${TARGET_SCHEMA_VERSION}" ]; then
- run_script "UPGRADE" "${file}" 2>&1 | tee -a $LOG
- fi
- done < $UPGRADE_LIST
- rm -f $UPGRADE_LIST
- set_current_release_level $TARGET_SCHEMA_VERSION
- elif [[ "${CURRENT_SCHEMA_VERSION}" > "${TARGET_SCHEMA_VERSION}" ]]; then
- # db downgrade
- echo "WARNING: Target db schema version is LOWER than current db scema version, please run downgrade script manually." | tee -a $LOG | tee -a $ERR
- else
- echo "CURRENT SCHEMA VERSION THE SAME AS TARGET SCHEMA VERSION, NO ACTION TAKEN ..." | tee -a $LOG
- fi
-}
-
-function run_script
-{
- action="${1}"
- script="${2}"
- echo "Perform DB $action on [${DB_HOSTNAME}] use $script ..." | tee -a $LOG
- echo "--" | tee -a $LOG
- ${MYSQL} --verbose < "${script}" 2>$ERR | tee -a $LOG
- echo "--" | tee -a $LOG
-}
-
-function set_current_release_level
-{
- DB_VERSION="${1}"
- echo "Set current release level on [${DB_HOSTNAME}] to [$DB_VERSION] started ...@`date`" | tee -a $LOG
- update_statement="insert into support.db_version (the_key, version) values ('DROOLS_VERSION', '${DB_VERSION}') on duplicate key update version='${DB_VERSION}';"
- ${MYSQL} --execute "${update_statement}"
-
- echo "" | tee -a $LOG
- echo "CURRENT_SCHEMA_VERSION set to: [$DB_VERSION]" | tee -a $LOG
- echo "" | tee -a $LOG
- echo "Set current release level on [${DB_HOSTNAME}] to [$DB_VERSION] completed ...@`date`" | tee -a $LOG
-}
-
-function check_directory
-{
- if [ ! -d $DB_UPGRADE_DIR ]; then
- echo "ERROR, DIRECTORY NOT EXIST: $DB_UPGRADE_DIR, PROCESS EXIT ..."
- exit;
- else
- if [ ! -d $DB_UPGRADE_DIR/logs ]; then
- mkdir $DB_UPGRADE_DIR/logs
- fi
- fi
-}
-
-# MAIN
-#check_directory
-LOG=$POLICY_HOME/logs/db_upgrade_droolspdp_remote_$DATE.log
-ERR=$POLICY_HOME/logs/db_upgrade_droolspdp_remote_$DATE.err
-echo "db_upgrade_droolspdp_remote.sh started ..." | tee -a $LOG
-if [ $# -eq 3 ]; then
- DB_UPGRADE_USER="${1}"
- DB_UPGRADE_PASSWORD="${2}"
- DB_HOSTNAME="${3}"
- echo "DB_UPGRADE_USER: $DB_UPGRADE_USER" | tee -a $LOG
- echo "DB_UPGRADE_DIR : $DB_UPGRADE_DIR" | tee -a $LOG
- echo "DB_HOSTNAME : $DB_HOSTNAME" | tee -a $LOG
- #
- typeset -r MYSQL="mysql -u${DB_UPGRADE_USER} -p${DB_UPGRADE_PASSWORD} -h ${DB_HOSTNAME}";
- get_target_schema_version
- if [ ${#TARGET_SCHEMA_VERSION} -ne 6 ]; then
- echo "ERROR, TARGET_SCHEMA_VERSION MUST BE 6 DIGITS: $TARGET_SCHEMA_VERSION" | tee -a $LOG | tee -a $ERR
- else
- get_current_schema_version
- evaluate_upgrade_downgrade
- fi
-else
- echo "Usage : db_upgrade_droolspdp_remote.sh db_user_id db_user_password db_hostname" | tee -a $LOG
- echo "Example: db_upgrade_droolspdp_remote.sh policy_user password policydb" | tee -a $LOG
-fi
-
-echo "db_upgrade_droolspdp_remote.sh completed ..." | tee -a $LOG
diff --git a/packages/base/src/files/bin/monitor.sh b/packages/base/src/files/bin/monitor.sh
index f4fad48..1137628 100644
--- a/packages/base/src/files/bin/monitor.sh
+++ b/packages/base/src/files/bin/monitor.sh
@@ -64,7 +64,6 @@
fi
CONTROLLER=$1
- NAGIOS_COMPONENT_SERVICE="Check_${CONTROLLER}-AliveStatus_AP_24094"
${POLICY_HOME}/bin/${CONTROLLER} status
if [[ $? != 0 ]]; then
@@ -84,7 +83,6 @@
fi
CONTROLLER=$1
- NAGIOS_COMPONENT_SERVICE="Check_${CONTROLLER}-AliveStatus_AP_24094"
${POLICY_HOME}/bin/${CONTROLLER} status
if [[ $? != 0 ]]; then
@@ -137,10 +135,6 @@
. ${POLICY_HOME}/etc/profile.d/env.sh
-if [[ ${NAGIOS_NRDP_DISABLED} == true ]]; then
- log "Nagios NRDS is disabled."
-fi
-
if flock ${cfg} ; then
process_config
fi {cfg}>>${POLICY_HOME}/etc/monitor/monitor.cfg.lock
diff --git a/packages/base/src/files/data/mysql/160400_droolspdp_downgrade_script.sql b/packages/base/src/files/data/mysql/160400_droolspdp_downgrade_script.sql
deleted file mode 100644
index 44f4919..0000000
--- a/packages/base/src/files/data/mysql/160400_droolspdp_downgrade_script.sql
+++ /dev/null
@@ -1,23 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Base Package
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
-drop table if exists drools.sessioninfo;
-drop table if exists drools.WORKITEMINFO;
-drop table if exists drools.droolspdpentity;
diff --git a/packages/base/src/files/data/mysql/160400_droolspdp_upgrade_script.sql b/packages/base/src/files/data/mysql/160400_droolspdp_upgrade_script.sql
deleted file mode 100644
index 03e9652..0000000
--- a/packages/base/src/files/data/mysql/160400_droolspdp_upgrade_script.sql
+++ /dev/null
@@ -1,57 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Base Package
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
--- use BLOB instead of LONGVARBINARY
-drop table if exists drools.sessioninfo;
-CREATE TABLE drools.SESSIONINFO
-(
-ID BIGINT NOT NULL,
-LASTMODIFICATIONDATE TIMESTAMP,
-RULESBYTEARRAY BLOB,
-STARTDATE TIMESTAMP default current_timestamp,
-OPTLOCK INTEGER,
-PRIMARY KEY (ID)
-);
-
-drop table if exists drools.WORKITEMINFO;
-CREATE TABLE drools.WORKITEMINFO
-(
-WORKITEMID BIGINT NOT NULL,
-CREATIONDATE TIMESTAMP default current_timestamp,
-`NAME` VARCHAR(500),
-PROCESSINSTANCEID BIGINT,
-STATE BIGINT,
-OPTLOCK INTEGER,
-WORKITEMBYTEARRAY BLOB,
-PRIMARY KEY (WORKITEMID)
-);
-
-drop table if exists drools.droolspdpentity;
-CREATE TABLE drools.DROOLSPDPENTITY
-(
- PDPID VARCHAR(100) NOT NULL,
- DESIGNATED BOOLEAN NOT NULL DEFAULT FALSE,
- PRIORITY INT NOT NULL DEFAULT 0,
- UPDATEDDATE DATE NOT NULL,
- GROUPID VARCHAR(100) NOT NULL,
- SESSIONID BIGINT NOT NULL
-);
-
-
diff --git a/packages/base/src/files/data/mysql/160401_droolspdp_downgrade_script.sql b/packages/base/src/files/data/mysql/160401_droolspdp_downgrade_script.sql
deleted file mode 100644
index c8bbe03..0000000
--- a/packages/base/src/files/data/mysql/160401_droolspdp_downgrade_script.sql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Base Package
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
-drop table if exists drools.droolspdpentity;
-CREATE TABLE drools.DROOLSPDPENTITY
-(
- PDPID VARCHAR(100) NOT NULL,
- DESIGNATED BOOLEAN NOT NULL DEFAULT FALSE,
- PRIORITY INT NOT NULL DEFAULT 0,
- UPDATEDDATE DATE NOT NULL,
- GROUPID VARCHAR(100) NOT NULL,
- SESSIONID BIGINT NOT NULL
-);
diff --git a/packages/base/src/files/data/mysql/160401_droolspdp_upgrade_script.sql b/packages/base/src/files/data/mysql/160401_droolspdp_upgrade_script.sql
deleted file mode 100644
index e7d9221..0000000
--- a/packages/base/src/files/data/mysql/160401_droolspdp_upgrade_script.sql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Base Package
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
-drop table if exists drools.droolspdpentity;
-CREATE TABLE drools.DROOLSPDPENTITY
-(
- PDPID VARCHAR(100) NOT NULL,
- DESIGNATED BOOLEAN NOT NULL DEFAULT FALSE,
- PRIORITY INT NOT NULL DEFAULT 0,
- UPDATEDDATE TIMESTAMP NOT NULL,
- GROUPID VARCHAR(100) NOT NULL,
- SESSIONID BIGINT NOT NULL
-);
diff --git a/packages/base/src/files/data/mysql/160700_droolspdp_downgrade_script.sql b/packages/base/src/files/data/mysql/160700_droolspdp_downgrade_script.sql
deleted file mode 100644
index c8613bb..0000000
--- a/packages/base/src/files/data/mysql/160700_droolspdp_downgrade_script.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Base Package
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
-drop table if exists drools.droolssessionentity;
-drop table if exists drools.droolspdpentity;
-drop table if exists drools.sessioninfo;
-drop table if exists drools.WORKITEMINFO;
-
diff --git a/packages/base/src/files/data/mysql/160700_droolspdp_upgrade_script.sql b/packages/base/src/files/data/mysql/160700_droolspdp_upgrade_script.sql
deleted file mode 100644
index 3350859..0000000
--- a/packages/base/src/files/data/mysql/160700_droolspdp_upgrade_script.sql
+++ /dev/null
@@ -1,68 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Base Package
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
-drop table if exists drools.droolssessionentity;
-drop table if exists drools.droolspdpentity;
-
-CREATE TABLE drools.DROOLSPDPENTITY
-(
- PDPID VARCHAR(100) NOT NULL,
- DESIGNATED BOOLEAN NOT NULL DEFAULT FALSE,
- PRIORITY INT NOT NULL DEFAULT 0,
- UPDATEDDATE TIMESTAMP NOT NULL,
- GROUPID VARCHAR(100) NOT NULL,
- SESSIONID BIGINT NOT NULL,
- PRIMARY KEY(PDPID)
-);
-
-CREATE TABLE drools.DROOLSSESSIONENTITY
-(
- PDPID VARCHAR(100) NOT NULL,
- SESSIONNAME VARCHAR(100) NOT NULL,
- SESSIONID BIGINT NOT NULL,
- PDPENTITY_pdpId BIGINT NOT NULL,
- PRIMARY KEY(PDPID,SESSIONNAME)
-);
-ALTER TABLE drools.DROOLSSESSIONENTITY ADD CONSTRAINT FK_DROOLSSESSIONENTITY_DROOLSPDPENTITY_PDPID
-FOREIGN KEY (PDPID) REFERENCES drools.DROOLSPDPENTITY (PDPID);
-
-drop table if exists drools.sessioninfo;
-CREATE TABLE drools.SESSIONINFO
-(
-ID BIGINT NOT NULL,
-LASTMODIFICATIONDATE TIMESTAMP,
-RULESBYTEARRAY BLOB,
-STARTDATE TIMESTAMP default current_timestamp,
-OPTLOCK INTEGER,
-PRIMARY KEY (ID)
-);
-
-drop table if exists drools.WORKITEMINFO;
-CREATE TABLE drools.WORKITEMINFO
-(
-WORKITEMID BIGINT NOT NULL,
-CREATIONDATE TIMESTAMP default current_timestamp,
-`NAME` VARCHAR(500),
-PROCESSINSTANCEID BIGINT,
-STATE BIGINT,
-OPTLOCK INTEGER,
-WORKITEMBYTEARRAY BLOB,
-PRIMARY KEY (WORKITEMID)
-);
diff --git a/packages/base/src/files/data/mysql/161000_droolspdp_downgrade_script.sql b/packages/base/src/files/data/mysql/161000_droolspdp_downgrade_script.sql
deleted file mode 100644
index b1ab793..0000000
--- a/packages/base/src/files/data/mysql/161000_droolspdp_downgrade_script.sql
+++ /dev/null
@@ -1,47 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Base Package
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
-drop table if exists drools.droolssessionentity;
-drop table if exists drools.droolspdpentity;
-
-CREATE TABLE drools.DROOLSPDPENTITY
-(
- PDPID VARCHAR(100) NOT NULL,
- DESIGNATED BOOLEAN NOT NULL DEFAULT FALSE,
- PRIORITY INT NOT NULL DEFAULT 0,
- UPDATEDDATE TIMESTAMP NOT NULL,
- GROUPID VARCHAR(100) NOT NULL,
- SESSIONID BIGINT NOT NULL,
- PRIMARY KEY(PDPID)
-);
-
-CREATE TABLE drools.DROOLSSESSIONENTITY
-(
- PDPID VARCHAR(100) NOT NULL,
- SESSIONNAME VARCHAR(100) NOT NULL,
- SESSIONID BIGINT NOT NULL,
- PDPENTITY_pdpId BIGINT NOT NULL,
- PRIMARY KEY(PDPID,SESSIONNAME)
-);
-ALTER TABLE drools.DROOLSSESSIONENTITY ADD CONSTRAINT FK_DROOLSSESSIONENTITY_DROOLSPDPENTITY_PDPID
-FOREIGN KEY (PDPID) REFERENCES drools.DROOLSPDPENTITY (PDPID);
-
-drop table if exists drools.LastSiteEntity;
-
diff --git a/packages/base/src/files/data/mysql/161000_droolspdp_upgrade_script.sql b/packages/base/src/files/data/mysql/161000_droolspdp_upgrade_script.sql
deleted file mode 100644
index 9ef2442..0000000
--- a/packages/base/src/files/data/mysql/161000_droolspdp_upgrade_script.sql
+++ /dev/null
@@ -1,54 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Base Package
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
-DROP TABLE if exists drools.DROOLSSESSIONENTITY;
-DROP TABLE if exists drools.DROOLSPDPENTITY;
-
-CREATE TABLE if not exists drools.DROOLSPDPENTITY
-(
-pdpId VARCHAR(255) NOT NULL,
-designated TINYINT(1) default 0 NOT NULL,
-priority INTEGER NOT NULL,
-site VARCHAR(50),
-updatedDate DATETIME NOT NULL,
-PRIMARY KEY (pdpId)
-);
-
-CREATE TABLE if not exists drools.DROOLSSESSIONENTITY
-(
-sessionName VARCHAR(255) NOT NULL,
-pdpId VARCHAR(255) NOT NULL,
-sessionId BIGINT NOT NULL,
-PDPENTITY_pdpId VARCHAR(255),
-PRIMARY KEY (sessionName, pdpId)
-);
-
-ALTER TABLE drools.DROOLSSESSIONENTITY ADD CONSTRAINT FK_DROOLSSESSIONENTITY_PDPENTITY_pdpId
-FOREIGN KEY (PDPENTITY_pdpId)
-REFERENCES drools.DROOLSPDPENTITY (pdpId);
-
-drop table if exists drools.LastSiteEntity;
-
-CREATE TABLE `drools`.`LastSiteEntity`
-( `id` INT NOT NULL ,
-`siteName` VARCHAR(50) NOT NULL
-);
-
-
diff --git a/packages/base/src/files/data/mysql/161001_droolspdp_downgrade_script.sql b/packages/base/src/files/data/mysql/161001_droolspdp_downgrade_script.sql
deleted file mode 100644
index 983a9f3..0000000
--- a/packages/base/src/files/data/mysql/161001_droolspdp_downgrade_script.sql
+++ /dev/null
@@ -1,56 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Base Package
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
-set foreign_key_checks=0;
-
-drop table if exists drools.LastSiteEntity;
-
-CREATE TABLE `drools`.`LastSiteEntity`
-( `id` INT NOT NULL ,
-`siteName` VARCHAR(50) NOT NULL
-);
-
-drop table if exists drools.DROOLSPDPENTITY;
-
-CREATE TABLE if not exists drools.DROOLSPDPENTITY
-(
-pdpId VARCHAR(255) NOT NULL,
-designated TINYINT(1) default 0 NOT NULL,
-priority INTEGER NOT NULL,
-site VARCHAR(50),
-updatedDate DATETIME NOT NULL,
-PRIMARY KEY (pdpId)
-);
-
-drop table if exists drools.DROOLSSESSIONENTITY;
-CREATE TABLE if not exists drools.DROOLSSESSIONENTITY
-(
-sessionName VARCHAR(255) NOT NULL,
-pdpId VARCHAR(255) NOT NULL,
-sessionId BIGINT NOT NULL,
-PDPENTITY_pdpId VARCHAR(255),
-PRIMARY KEY (sessionName, pdpId)
-);
-
-ALTER TABLE drools.DROOLSSESSIONENTITY ADD CONSTRAINT FK_DROOLSSESSIONENTITY_PDPENTITY_pdpId
-FOREIGN KEY (PDPENTITY_pdpId)
-REFERENCES drools.DROOLSPDPENTITY (pdpId);
-
-set foreign_key_checks=1;
diff --git a/packages/base/src/files/data/mysql/161001_droolspdp_upgrade_script.sql b/packages/base/src/files/data/mysql/161001_droolspdp_upgrade_script.sql
deleted file mode 100644
index 2731e1b..0000000
--- a/packages/base/src/files/data/mysql/161001_droolspdp_upgrade_script.sql
+++ /dev/null
@@ -1,52 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Base Package
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
-set foreign_key_checks=0;
-
-drop table if exists drools.LastSiteEntity;
-
-drop table if exists drools.DROOLSPDPENTITY;
-
-CREATE TABLE if not exists drools.DROOLSPDPENTITY
-(
-pdpId VARCHAR(255) NOT NULL,
-designated TINYINT(1) default 0 NOT NULL,
-priority INTEGER NOT NULL,
-site VARCHAR(50),
-updatedDate DATETIME NOT NULL,
-designatedDate DATETIME NOT NULL,
-PRIMARY KEY (pdpId)
-);
-
-drop table if exists drools.DROOLSSESSIONENTITY;
-CREATE TABLE if not exists drools.DROOLSSESSIONENTITY
-(
-sessionName VARCHAR(255) NOT NULL,
-pdpId VARCHAR(255) NOT NULL,
-sessionId BIGINT NOT NULL,
-PDPENTITY_pdpId VARCHAR(255),
-PRIMARY KEY (sessionName, pdpId)
-);
-
-ALTER TABLE drools.DROOLSSESSIONENTITY ADD CONSTRAINT FK_DROOLSSESSIONENTITY_PDPENTITY_pdpId
-FOREIGN KEY (PDPENTITY_pdpId)
-REFERENCES drools.DROOLSPDPENTITY (pdpId);
-
-set foreign_key_checks=1;
diff --git a/packages/base/src/files/data/mysql/161002_droolspdp_downgrade_script.sql b/packages/base/src/files/data/mysql/161002_droolspdp_downgrade_script.sql
deleted file mode 100644
index 90ed645..0000000
--- a/packages/base/src/files/data/mysql/161002_droolspdp_downgrade_script.sql
+++ /dev/null
@@ -1,21 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Base Package
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
-drop table if exists drools.IntegrityAuditEntity;
diff --git a/packages/base/src/files/data/mysql/161002_droolspdp_upgrade_script.sql b/packages/base/src/files/data/mysql/161002_droolspdp_upgrade_script.sql
deleted file mode 100644
index ff99d36..0000000
--- a/packages/base/src/files/data/mysql/161002_droolspdp_upgrade_script.sql
+++ /dev/null
@@ -1,41 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Base Package
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
-drop table if exists drools.IntegrityAuditEntity;
-create table if not exists drools.IntegrityAuditEntity
-(
- id int not null auto_increment,
- persistenceUnit varchar(100) not null,
- site varchar(100),
- nodeType varchar(100),
- resourceName varchar(100) not null,
- designated boolean default false,
- jdbcDriver varchar(100) not null,
- jdbcUrl varchar(100) not null,
- jdbcUser varchar(30) not null,
- jdbcPassword varchar(30) not null,
- createdDate TIMESTAMP NOT NULL default current_timestamp,
- lastUpdated TIMESTAMP NOT NULL,
- primary key(id)
-);
-
-alter table drools.IntegrityAuditEntity add constraint resourceName_uniq unique(resourceName);
-
-
diff --git a/packages/base/src/files/data/mysql/161003_droolspdp_downgrade_script.sql b/packages/base/src/files/data/mysql/161003_droolspdp_downgrade_script.sql
deleted file mode 100644
index ba9ac57..0000000
--- a/packages/base/src/files/data/mysql/161003_droolspdp_downgrade_script.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Base Package
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
-drop table if exists drools.SEQUENCE;
-
diff --git a/packages/base/src/files/data/mysql/161003_droolspdp_upgrade_script.sql b/packages/base/src/files/data/mysql/161003_droolspdp_upgrade_script.sql
deleted file mode 100644
index 7f8c17c..0000000
--- a/packages/base/src/files/data/mysql/161003_droolspdp_upgrade_script.sql
+++ /dev/null
@@ -1,29 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Base Package
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
-drop table if exists drools.SEQUENCE;
-CREATE TABLE drools.SEQUENCE
-(
-SEQ_NAME VARCHAR(50) NOT NULL,
-SEQ_COUNT NUMERIC(38),
-PRIMARY KEY (SEQ_NAME)
-);
-
-INSERT INTO drools.SEQUENCE (SEQ_NAME,SEQ_COUNT) VALUES ('SEQ_GEN',3050);
diff --git a/packages/base/src/files/data/mysql/161004_droolspdp_downgrade_script.sql b/packages/base/src/files/data/mysql/161004_droolspdp_downgrade_script.sql
deleted file mode 100644
index 5cabefb..0000000
--- a/packages/base/src/files/data/mysql/161004_droolspdp_downgrade_script.sql
+++ /dev/null
@@ -1,22 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP POLICY
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
-alter table drools.droolsPdpEntity modify updatedDate datetime not null;
-alter table drools.droolsPdpEntity modify designatedDate datetime not null;
diff --git a/packages/base/src/files/data/mysql/161004_droolspdp_upgrade_script.sql b/packages/base/src/files/data/mysql/161004_droolspdp_upgrade_script.sql
deleted file mode 100644
index 5069aad..0000000
--- a/packages/base/src/files/data/mysql/161004_droolspdp_upgrade_script.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP POLICY
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
-alter table drools.droolsPdpEntity modify updatedDate timestamp not null;
-alter table drools.droolsPdpEntity modify designatedDate timestamp not null;
-
-
-
diff --git a/packages/base/src/files/data/mysql/170200_droolspdp_downgrade_script.sql b/packages/base/src/files/data/mysql/170200_droolspdp_downgrade_script.sql
deleted file mode 100644
index 928a584..0000000
--- a/packages/base/src/files/data/mysql/170200_droolspdp_downgrade_script.sql
+++ /dev/null
@@ -1,21 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Base Package
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
-alter table drools.IntegrityAuditEntity modify jdbcUrl varchar(100) not null;
diff --git a/packages/base/src/files/data/mysql/170200_droolspdp_upgrade_script.sql b/packages/base/src/files/data/mysql/170200_droolspdp_upgrade_script.sql
deleted file mode 100644
index 93bb69e..0000000
--- a/packages/base/src/files/data/mysql/170200_droolspdp_upgrade_script.sql
+++ /dev/null
@@ -1,21 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * Base Package
- * ================================================================================
- * Copyright (C) 2017 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=========================================================
- */
-
-alter table drools.IntegrityAuditEntity modify jdbcUrl varchar(200) not null;
diff --git a/packages/base/src/files/etc/profile.d/su.cfg b/packages/base/src/files/etc/profile.d/su.cfg
deleted file mode 100644
index ddef1b6..0000000
--- a/packages/base/src/files/etc/profile.d/su.cfg
+++ /dev/null
@@ -1,21 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP POLICY
-# ================================================================================
-# Copyright (C) 2017 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=========================================================
-###
-#
-# name=value pairs for su purposes
diff --git a/packages/install/pom.xml b/packages/install/pom.xml
index 287a9d7..60da88a 100644
--- a/packages/install/pom.xml
+++ b/packages/install/pom.xml
@@ -33,7 +33,7 @@
<packaging>pom</packaging>
<name>Installation Package</name>
- <description>D2 ECOMP Policy Drools PDP Installation Package</description>
+ <description>ONAP Policy Drools PDP Installation Package</description>
<build>
<plugins>
@@ -73,12 +73,6 @@
</dependency>
<dependency>
<groupId>org.openecomp.policy.drools-pdp</groupId>
- <artifactId>policy-persistence</artifactId>
- <version>${project.version}</version>
- <type>zip</type>
- </dependency>
- <dependency>
- <groupId>org.openecomp.policy.drools-pdp</groupId>
<artifactId>policy-healthcheck</artifactId>
<version>${project.version}</version>
<type>zip</type>
diff --git a/packages/install/src/files/base.conf b/packages/install/src/files/base.conf
index b791f63..9278f0b 100644
--- a/packages/install/src/files/base.conf
+++ b/packages/install/src/files/base.conf
@@ -27,42 +27,6 @@
ENGINE_MANAGEMENT_USER=@1b3rt
ENGINE_MANAGEMENT_PASSWORD=31nst@1n
-ENGINE_HEALTHCHECK_HOST=0.0.0.0
-ENGINE_HEALTHCHECK_PORT=9697
-
-JDBC_DRIVER=org.mariadb.jdbc.Driver
-JDBC_URL=jdbc:mysql://localhost:3306/xacml
-JDBC_DROOLS_URL=jdbc:mysql://localhost:3306/drools
-JDBC_USER=policy_user
-JDBC_PASSWORD=
-
-NAGIOS_CONFIG_NAME=policy
-NAGIOS_NRDP_URL=
-NAGIOS_NRDP_TOKEN=bbpguvsohehj
-NAGIOS_NRDP_DISABLED=true
-
-# Integrity Monitor properties
-site_name=site_1
-fp_monitor_interval=30
-failed_counter_threshold=3
-test_trans_interval=20
-write_fpc_interval=5
-max_fpc_update_interval=60
-test_via_jmx=false
-node_type=pdp_drools
-# Dependency groups are groups of resources upon which a node operational state is dependent upon.
-# Each group is a comma-separated list of resource names and groups are separated by a semicolon.
-dependency_groups=site_1.pap_1,site_1.pap_2;site_1.pdp_1,site_1.pdp_2
-resource_name=pdpd_1
-
-# The (optional) period of time in seconds between executions of the integrity audit.
-# Value < 0 : Audit does not run (default value if property is not present = -1)
-# Value = 0 : Audit runs continuously
-# Value > 0 : The period of time in seconds between execution of the audit on a particular node
-integrity_audit_period_seconds=-1
-
-host_port=0.0.0.0:9981
-
# To use a Nexus repository for rules artifacts,
# following properties must be uncommented and set:
#repositoryID=policy-nexus
@@ -70,7 +34,6 @@
#repositoryUsername=(nexus username goes here)
#repositoryPassword=(password goes here)
-# just for testing purposes, modify at installation
PDPD_CONFIGURATION_TOPIC=PDPD_CONFIGURATION
PDPD_CONFIGURATION_SERVERS=
PDPD_CONFIGURATION_API_KEY=
diff --git a/packages/pom.xml b/packages/pom.xml
index eda8609..9ed60d1 100644
--- a/packages/pom.xml
+++ b/packages/pom.xml
@@ -33,11 +33,10 @@
<packaging>pom</packaging>
<name>Policy Packages</name>
- <description>D2 ECOMP Policy Drools PDP Installation Packages</description>
+ <description>ONAP Policy Drools PDP Installation Packages</description>
<modules>
<module>base</module>
- <!-- <module>root</module> -->
<module>install</module>
</modules>
</project>
diff --git a/policy-core/pom.xml b/policy-core/pom.xml
index 1872394..4d504a6 100644
--- a/policy-core/pom.xml
+++ b/policy-core/pom.xml
@@ -32,11 +32,6 @@
<dependencies>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- </dependency>
- <dependency>
<groupId>org.kie</groupId>
<artifactId>kie-api</artifactId>
<version>6.3.0.Final</version>
@@ -59,7 +54,6 @@
<version>6.3.0.Final</version>
</dependency>
<dependency>
- <!-- leave this for now, but will remove policy-utils at the end of conversion -->
<groupId>org.openecomp.policy.drools-pdp</groupId>
<artifactId>policy-utils</artifactId>
<version>${project.version}</version>
@@ -70,68 +64,16 @@
<version>${common-modules.version}</version>
</dependency>
<dependency>
- <groupId>org.openecomp.policy.common</groupId>
- <artifactId>integrity-monitor</artifactId>
- <version>${common-modules.version}</version>
- </dependency>
- <dependency>
- <groupId>org.openecomp.policy.common</groupId>
- <artifactId>integrity-audit</artifactId>
- <version>${common-modules.version}</version>
- </dependency>
- <dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>1.2.3</version>
<scope>runtime</scope>
</dependency>
<dependency>
- <groupId>com.h2database</groupId>
- <artifactId>h2</artifactId>
- <version>[1.4.186,)</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.4.1</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.codehaus.btm</groupId>
- <artifactId>btm</artifactId>
- <version>2.1.4</version>
- </dependency>
- <dependency>
- <groupId>org.eclipse.persistence</groupId>
- <artifactId>eclipselink</artifactId>
- <version>2.6.2</version>
- </dependency>
- <dependency>
- <groupId>org.hibernate</groupId>
- <artifactId>hibernate-entitymanager</artifactId>
- <version>5.0.7.Final</version>
- </dependency>
-
- <dependency>
- <groupId>org.json</groupId>
- <artifactId>json</artifactId>
- <version>20160810</version>
- </dependency>
</dependencies>
-
- <dependencyManagement>
- <dependencies>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.5</version>
- </dependency>
- </dependencies>
- </dependencyManagement>
</project>
diff --git a/policy-core/src/assembly/assemble_zip.xml b/policy-core/src/assembly/assemble_zip.xml
deleted file mode 100644
index 447a527..0000000
--- a/policy-core/src/assembly/assemble_zip.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<!--
- ============LICENSE_START=======================================================
- policy-core
- ================================================================================
- Copyright (C) 2017 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=========================================================
- -->
-
-<!-- Defines how we build the .zip file which is our distribution. -->
-
-<assembly
- 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>runtime</id>
- <formats>
- <format>zip</format>
- </formats>
-
- <!-- we want "system" and related files right at the root level as this
- file is suppose to be unzip on top of a karaf distro. -->
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>policy-core-${project.version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target/assembly/</directory>
- <outputDirectory>.</outputDirectory>
- <excludes>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>.</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/server-gen/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>0744</fileMode>
- <excludes>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>src/main/server/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>0744</fileMode>
- <excludes>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>src/main/server-gen/scripts</directory>
- <outputDirectory>scripts</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>src/main/server/scripts</directory>
- <outputDirectory>scripts</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>src/main/server/config</directory>
- <outputDirectory>config</outputDirectory>
- </fileSet>
- </fileSets>
-
-</assembly>
diff --git a/policy-core/src/main/resources/META-INF/jndi.properties b/policy-core/src/main/resources/META-INF/jndi.properties
deleted file mode 100644
index 033a08a..0000000
--- a/policy-core/src/main/resources/META-INF/jndi.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-core
-# ================================================================================
-# Copyright (C) 2017 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=========================================================
-###
-
-java.naming.factory.initial=bitronix.tm.jndi.BitronixInitialContextFactory
diff --git a/policy-core/src/main/resources/META-INF/persistence.xml b/policy-core/src/main/resources/META-INF/persistence.xml
deleted file mode 100644
index cc44aca..0000000
--- a/policy-core/src/main/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============LICENSE_START=======================================================
- policy-core
- ================================================================================
- Copyright (C) 2017 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=========================================================
- -->
-
-<persistence version="2.1"
- xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
-
- <persistence-unit name="ncompPU" transaction-type="RESOURCE_LOCAL">
- <!-- This is for database access by non-drools methods -->
- <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <class>org.openecomp.policy.common.im.jpa.StateManagementEntity</class>
- <class>org.openecomp.policy.drools.persistence.DroolsPdpEntity</class>
- <class>org.openecomp.policy.drools.persistence.DroolsSessionEntity</class>
- <class>org.drools.persistence.info.SessionInfo</class>
- <class>org.drools.persistence.info.WorkItemInfo</class>
- <class>org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity</class>
-
- <properties>
- <!-- Properties are passed in -->
- </properties>
- </persistence-unit>
-
- <!-- This is the PU used by IntegrityAudit to audit DB tables used by Drools PDP -->
- <persistence-unit name="auditDroolsPU" transaction-type="RESOURCE_LOCAL">
- <!-- This is for database access by non-drools methods -->
- <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <class>org.openecomp.policy.drools.persistence.DroolsPdpEntity</class>
- <class>org.openecomp.policy.drools.persistence.DroolsSessionEntity</class>
- <class>org.drools.persistence.info.SessionInfo</class>
- <class>org.drools.persistence.info.WorkItemInfo</class>
- <class>org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity</class>
- <properties>
- <!-- Properties are passed in -->
- </properties>
- </persistence-unit>
-
- <persistence-unit name="ncompsessionsPU" transaction-type="JTA">
- <!-- Used for drools session data access -->
- <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
- <class>org.drools.persistence.info.SessionInfo</class>
- <class>org.drools.persistence.info.WorkItemInfo</class>
- <properties>
- <property name="hibernate.dialect" value="org.hibernate.dialect.MySQLDialect" />
- <property name="hibernate.max_fetch_depth" value="3" />
- <property name="hibernate.hbm2ddl.auto" value="update" />
- <property name="hibernate.show_sql" value="false" />
- <property name="hibernate.transaction.manager_lookup_class"
- value="org.hibernate.transaction.BTMTransactionManagerLookup" />
- </properties>
- </persistence-unit>
-
-
- <persistence-unit name="schemaPU" transaction-type="RESOURCE_LOCAL">
- <!-- Limited use for generating the DB and schema files for ncomp DB - uses eclipselink for convenience -->
- <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <class>org.drools.persistence.info.SessionInfo</class>
- <class>org.drools.persistence.info.WorkItemInfo</class>
- <class>org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity</class>
- <properties>
- <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
- <property name="javax.persistence.schema-generation.scripts.action" value="drop-and-create"/>
- <property name="javax.persistence.schema-generation.scripts.create-target" value="./sql/generatedCreateNcomp.ddl"/>
- <property name="javax.persistence.schema-generation.scripts.drop-target" value="./sql/generatedDropNcomp.ddl"/>
- </properties>
- </persistence-unit>
-</persistence>
diff --git a/policy-endpoints/pom.xml b/policy-endpoints/pom.xml
index dba7349..de95eb9 100644
--- a/policy-endpoints/pom.xml
+++ b/policy-endpoints/pom.xml
@@ -21,27 +21,27 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
+ <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.openecomp.policy.drools-pdp</groupId>
- <artifactId>drools-pdp</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </parent>
+ <parent>
+ <groupId>org.openecomp.policy.drools-pdp</groupId>
+ <artifactId>drools-pdp</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </parent>
- <artifactId>policy-endpoints</artifactId>
+ <artifactId>policy-endpoints</artifactId>
- <name>policy-endpoints</name>
- <description>Policy UEB support</description>
+ <name>policy-endpoints</name>
+ <description>Endpoints</description>
- <properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- <jetty.version>9.3.14.v20161028</jetty.version>
-
- </properties>
+ <properties>
+ <maven.compiler.source>1.8</maven.compiler.source>
+ <maven.compiler.target>1.8</maven.compiler.target>
+ <jetty.version>9.3.14.v20161028</jetty.version>
+ </properties>
<dependencies>
+
<dependency>
<groupId>com.att.nsa</groupId>
<artifactId>cambriaClient</artifactId>
@@ -57,6 +57,7 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>com.att.nsa</groupId>
<artifactId>dmaapClient</artifactId>
@@ -68,6 +69,7 @@
</exclusion>
</exclusions>
</dependency>
+
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
@@ -138,26 +140,35 @@
<artifactId>swagger-jersey2-jaxrs</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore</artifactId>
- <version>4.4.4</version>
- </dependency>
- <dependency>
+ </dependency>
+
+ <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
- <version>4.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.commons</groupId>
<artifactId>commons-collections4</artifactId>
<version>4.1</version>
</dependency>
+
<dependency>
<groupId>org.openecomp.policy.drools-pdp</groupId>
<artifactId>policy-core</artifactId>
<version>${project.version}</version>
</dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.12</version>
+ <scope>test</scope>
+ </dependency>
+
</dependencies>
</project>
diff --git a/policy-management/src/assembly/assemble_zip.xml b/policy-management/src/assembly/assemble_zip.xml
index 85a1dbf..a910825 100644
--- a/policy-management/src/assembly/assemble_zip.xml
+++ b/policy-management/src/assembly/assemble_zip.xml
@@ -29,8 +29,6 @@
<format>zip</format>
</formats>
- <!-- we want "system" and related files right at the root level as this
- file is suppose to be unzip on top of a karaf distro. -->
<includeBaseDirectory>false</includeBaseDirectory>
<fileSets>
diff --git a/policy-management/src/main/server/config/IntegrityMonitor.properties b/policy-management/src/main/server/config/IntegrityMonitor.properties
deleted file mode 100644
index 293f358..0000000
--- a/policy-management/src/main/server/config/IntegrityMonitor.properties
+++ /dev/null
@@ -1,90 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-management
-# ================================================================================
-# Copyright (C) 2017 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=========================================================
-###
-
-hostPort = ${{host_port}}
-
-http.server.services=TEST
-http.server.services.TEST.host=0.0.0.0
-http.server.services.TEST.port=9981
-http.server.services.TEST.restClasses=org.openecomp.policy.drools.core.IntegrityMonitorRestManager
-http.server.services.TEST.managed=false
-http.server.services.TEST.swagger=true
-
-# The following were added as part of US673632
-#
-# Forward Progress Monitor update interval seconds
-fp_monitor_interval = ${{fp_monitor_interval}}
-# Failed counter threshold before failover
-failed_counter_threshold = ${{failed_counter_threshold}}
-# Interval between test transactions when no traffic seconds
-test_trans_interval = ${{test_trans_interval}}
-# Interval between writes of the FPC to the DB seconds
-write_fpc_interval = ${{write_fpc_interval}}
-# Name of the site in which this node is hosted
-site_name = ${{site_name}}
-# Node type
-# Note: Make sure you don't leave any trailing spaces, or you'll get an 'invalid node type' error!
-node_type = pdp_drools
-# Dependency groups are groups of resources upon which a node operational state is dependent upon.
-# Each group is a comma-separated list of resource names and groups are separated by a semicolon. For example:
-dependency_groups=${{dependency_groups}}
-# When set to true, dependent health checks are performed by using JMX to invoke test() on the dependent.
-# The default false is to use state checks for health.
-test_via_jmx=${{test_via_jmx}}
-# This is the max number of seconds beyond which a non incrementing FPC is considered a failure
-max_fpc_update_interval=${{max_fpc_update_interval}}
-
-# Needed by DroolsPdpsElectionHandler
-pdp.checkInterval=7000
-pdp.updateInterval=10000
-#pdp.timeout=3000
-# Need long timeout, because testTransaction is only run every 10 seconds.
-pdp.timeout=15000
-#how long do we wait for the pdp table to populate on initial startup
-pdp.initialWait=20000
-
-# Known as the PDPID in the droolpdpentity table.
-#resource.name=pdp1
-resource.name=${{resource_name}}
-
-# The amount of this a resource (entity) should sleep between audit executions.
-# If not specified, defaults to five seconds.
-# -1 turns off audit
-# zero forces audit to run continuously
-integrity_audit_period_seconds=-1
-
-# Properties needed for repository audit
-# Assume it's the releaseRepository that needs to be audited,
-# because that's the one BRMGW will publish to.
-repository.audit.id=${{releaseRepositoryID}}
-repository.audit.url=${{releaseRepositoryUrl}}
-repository.audit.username=${{repositoryUsername}}
-repository.audit.password=${{repositoryPassword}}
-
-# Flag to control the execution of the subsystemTest for the Database
-db.audit.is.active=false
-
-# Flag to control the execution of the subsystemTest for the Nexus Maven repository
-repository.audit.is.active=false
-repository.audit.ignore.errors=true
-
-# Run the state audit every 60 seconds (60000 ms). NOTE! It will only run on nodes that are providing service.
-# A value of <= 0 will turn off the state audit.
-state_audit_interval_ms=60000
diff --git a/policy-management/src/main/server/config/droolsPersistence.properties b/policy-management/src/main/server/config/droolsPersistence.properties
deleted file mode 100644
index 2fc6dc8..0000000
--- a/policy-management/src/main/server/config/droolsPersistence.properties
+++ /dev/null
@@ -1,55 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-management
-# ================================================================================
-# Copyright (C) 2017 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=========================================================
-###
-
-#javax.persistence.jdbc.driver = org.h2.Driver
-#javax.persistence.jdbc.url = jdbc:h2:file:./sql/drools
-#javax.persistence.jdbc.user = sa
-#javax.persistence.jdbc.password =
-
-#javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver
-#javax.persistence.jdbc.url=jdbc:mariadb://localhost:3306/drools
-#javax.persistence.jdbc.user=root
-#javax.persistence.jdbc.password=policy
-
-javax.persistence.jdbc.driver = ${{JDBC_DRIVER}}
-javax.persistence.jdbc.url = ${{JDBC_DROOLS_URL}}
-javax.persistence.jdbc.user = ${{JDBC_USER}}
-javax.persistence.jdbc.password = ${{JDBC_PASSWORD}}
-
-# Needed?
-#javax.persistence.jdbc.driver = org.h2.Driver
-#javax.persistence.jdbc.url = jdbc:h2:file:./sql/ncomp
-#javax.persistence.jdbc.user = sa
-#javax.persistence.jdbc.password =
-#persistenceDisabled=false
-#javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver
-#javax.persistence.jdbc.url=jdbc:mariadb://192.168.56.30:3306/drools
-#javax.persistence.jdbc.user=patb
-#javax.persistence.jdbc.password=policy
-
-hibernate.dataSource=org.mariadb.jdbc.MySQLDataSource
-
-# The number of seconds that persistence data remains valid after a
-# DroolsPDP shutdown or side switch -- older data is removed
-# (if this field is not specified or <= 0, the time is indefinite)
-persistence.sessioninfo.timeout=900
-
-# For testing purposes, it may be convenient to disable persistence
-persistenceDisabled=false
diff --git a/policy-management/src/main/server/config/xacmlPersistence.properties b/policy-management/src/main/server/config/xacmlPersistence.properties
deleted file mode 100644
index e88d8aa..0000000
--- a/policy-management/src/main/server/config/xacmlPersistence.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-management
-# ================================================================================
-# Copyright (C) 2017 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=========================================================
-###
-
-#javax.persistence.jdbc.driver = org.h2.Driver
-#javax.persistence.jdbc.url = jdbc:h2:file:./sql/xacml
-#javax.persistence.jdbc.user = sa
-#javax.persistence.jdbc.password =
-
-#javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver
-#javax.persistence.jdbc.url=jdbc:mariadb://127.0.0.1:3306/xacml
-#javax.persistence.jdbc.user=root
-#javax.persistence.jdbc.password=policy
-
-javax.persistence.jdbc.driver = ${{JDBC_DRIVER}}
-javax.persistence.jdbc.url = ${{JDBC_URL}}
-javax.persistence.jdbc.user = ${{JDBC_USER}}
-javax.persistence.jdbc.password = ${{JDBC_PASSWORD}}
-
-# Needed?
-hibernate.dataSource=org.mariadb.jdbc.MySQLDataSource
-
-# For testing purposes, it may be convenient to disable persistence
-persistenceDisabled=false
-
-
-
diff --git a/policy-persistence/config/policy-engine.properties b/policy-persistence/config/policy-engine.properties
deleted file mode 100644
index 2c50ba9..0000000
--- a/policy-persistence/config/policy-engine.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-persistence
-# ================================================================================
-# Copyright (C) 2017 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=========================================================
-###
-
-# Policy Engine Configuration
-
-# Configuration Channel Settings: PDPD_CONFIGURATION
-
-ueb.source.topics=PDPD_CONFIGURATION
-ueb.source.topics.PDPD_CONFIGURATION.servers=
-ueb.source.topics.PDPD_CONFIGURATION.apiKey=
-ueb.source.topics.PDPD_CONFIGURATION.apiSecret=
-
-ueb.sink.topics=PDPD_CONFIGURATION
-ueb.sink.topics.PDPD_CONFIGURATION.servers=
-ueb.sink.topics.PDPD_CONFIGURATION.apiKey=
-ueb.sink.topics.PDPD_CONFIGURATION.apiSecret=
diff --git a/policy-persistence/config/policyLogger.properties b/policy-persistence/config/policyLogger.properties
deleted file mode 100644
index 6ee66fd..0000000
--- a/policy-persistence/config/policyLogger.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-persistence
-# ================================================================================
-# Copyright (C) 2017 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=========================================================
-###
-
-################################### Set concurrentHashMap and timer info #######################
-#Timer initial delay and the delay between in milliseconds before task is to be execute.
-timer.delay.time=1000
-#Timer scheduleAtFixedRate period - time in milliseconds between successive task executions.
-check.interval= 30000
-#Longest time an event info can be stored in the concurrentHashMap for logging - in seconds.
-event.expired.time=86400
-#Size of the concurrentHashMap which stores the event starting time, etc - when its size reaches this limit, the Timer gets executed
-#to remove all expired records from this concurrentHashMap.
-concurrentHashMap.limit=5000
-#Size of the concurrentHashMap - when its size drops to this point, stop the Timer
-stop.check.point=2500
-################################### Set logging format #############################################
-# set EELF for EELF logging format, set LOG4J for using log4j, set SYSTEMOUT for using system.out.println
-logger.type=EELF
-#################################### Set level for EELF or SYSTEMOUT logging ##################################
-# Set level for debug file. Set DEBUG to enable .info, .warn and .debug; set INFO for enable .info and .warn; set OFF to disable all
-debugLogger.level=INFO
-# Set level for metrics file. Set OFF to disable; set ON to enable
-metricsLogger.level=ON
-# Set level for error file. Set OFF to disable; set ON to enable
-error.level=ON
-# Set level for audit file. Set OFF to disable; set ON to enable
-audit.level=ON
diff --git a/policy-persistence/pom.xml b/policy-persistence/pom.xml
deleted file mode 100644
index d6c90d5..0000000
--- a/policy-persistence/pom.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<!--
- ============LICENSE_START=======================================================
- ECOMP Policy Engine - Drools PDP
- ================================================================================
- Copyright (C) 2017 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=========================================================
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.openecomp.policy.drools-pdp</groupId>
- <artifactId>drools-pdp</artifactId>
- <version>1.1.0-SNAPSHOT</version>
- </parent>
-
- <artifactId>policy-persistence</artifactId>
-
- <name>policy-persistence</name>
- <description>Separately loadable module with persistence code</description>
-
- <properties>
- <maven.compiler.source>1.8</maven.compiler.source>
- <maven.compiler.target>1.8</maven.compiler.target>
- <swagger.version>1.5.0</swagger.version>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <id>zipfile</id>
- <goals>
- <goal>single</goal>
- </goals>
- <phase>package</phase>
- <configuration>
- <attach>true</attach>
- <finalName>${project.artifactId}-${project.version}</finalName>
- <descriptors>
- <descriptor>src/assembly/assemble_zip.xml</descriptor>
- </descriptors>
- <appendAssemblyId>false</appendAssemblyId>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.8</version>
- <executions>
- <execution>
- <id>copy-dependencies</id>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <phase>prepare-package</phase>
- <configuration>
- <transitive>false</transitive>
- <outputDirectory>${project.build.directory}/assembly/lib</outputDirectory>
- <overWriteReleases>false</overWriteReleases>
- <overWriteSnapshots>true</overWriteSnapshots>
- <overWriteIfNewer>true</overWriteIfNewer>
- <useRepositoryLayout>false</useRepositoryLayout>
- <addParentPoms>false</addParentPoms>
- <copyPom>false</copyPom>
- <excludeGroupIds>javax.inject</excludeGroupIds>
- <excludeScope>provided</excludeScope>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>io.swagger</groupId>
- <artifactId>swagger-jersey2-jaxrs</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.openecomp.policy.drools-pdp</groupId>
- <artifactId>policy-core</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.openecomp.policy.drools-pdp</groupId>
- <artifactId>policy-management</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
diff --git a/policy-persistence/src/assembly/assemble_zip.xml b/policy-persistence/src/assembly/assemble_zip.xml
deleted file mode 100644
index e0e22f5..0000000
--- a/policy-persistence/src/assembly/assemble_zip.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<!--
- ============LICENSE_START=======================================================
- policy-persistence
- ================================================================================
- Copyright (C) 2017 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=========================================================
- -->
-
-<!-- Defines how we build the .zip file which is our distribution. -->
-
-<assembly
- 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>runtime</id>
- <formats>
- <format>zip</format>
- </formats>
-
- <!-- we want "system" and related files right at the root level as this
- file is suppose to be unzip on top of a karaf distro. -->
- <includeBaseDirectory>false</includeBaseDirectory>
-
- <fileSets>
- <fileSet>
- <directory>target</directory>
- <outputDirectory>lib/opt</outputDirectory>
- <includes>
- <include>policy-persistence-${project.version}.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>target/assembly/</directory>
- <outputDirectory>.</outputDirectory>
- <excludes>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>.</directory>
- <outputDirectory>lib</outputDirectory>
- <includes>
- <include>*.jar</include>
- </includes>
- </fileSet>
- <fileSet>
- <directory>src/main/server-gen/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>0744</fileMode>
- <excludes>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>src/main/server/bin</directory>
- <outputDirectory>bin</outputDirectory>
- <fileMode>0744</fileMode>
- <excludes>
- </excludes>
- </fileSet>
- <fileSet>
- <directory>src/main/server-gen/scripts</directory>
- <outputDirectory>scripts</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>src/main/server/scripts</directory>
- <outputDirectory>scripts</outputDirectory>
- </fileSet>
- <fileSet>
- <directory>src/main/server/config</directory>
- <outputDirectory>config</outputDirectory>
- </fileSet>
- </fileSets>
-
-</assembly>
diff --git a/policy-persistence/src/main/java/org/openecomp/policy/drools/core/DbAudit.java b/policy-persistence/src/main/java/org/openecomp/policy/drools/core/DbAudit.java
deleted file mode 100644
index f534cc2..0000000
--- a/policy-persistence/src/main/java/org/openecomp/policy/drools/core/DbAudit.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.policy.drools.core;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.util.Properties;
-import java.util.UUID;
-
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.drools.persistence.DroolsPersistenceProperties;
-
-/**
- * This class audits the database
- */
-public class DbAudit extends DroolsPDPIntegrityMonitor.AuditBase
-{
- // get an instance of logger
- private static Logger logger = FlexLogger.getLogger(DbAudit.class);
- // single global instance of this audit object
- static private DbAudit instance = new DbAudit();
-
- // This indicates if 'CREATE TABLE IF NOT EXISTS Audit ...' should be
- // invoked -- doing this avoids the need to create the table in advance.
- static private boolean createTableNeeded = true;
-
- /**
- * @return the single 'DbAudit' instance
- */
- static DroolsPDPIntegrityMonitor.AuditBase getInstance()
- {
- return(instance);
- }
-
- /**
- * Constructor - set the name to 'Database'
- */
- private DbAudit()
- {
- super("Database");
- }
-
- /**
- * Invoke the audit
- *
- * @param properties properties to be passed to the audit
- */
- @Override
- public void invoke(Properties droolsPersistenceProperties)
- {
- logger.info("Running 'DbAudit.invoke'");
- boolean isActive = true;
- String dbAuditIsActive = IntegrityMonitorProperties.getProperty("db.audit.is.active");
- logger.debug("DbAudit.invoke: dbAuditIsActive = " + dbAuditIsActive);
-
- if (dbAuditIsActive != null) {
- try {
- isActive = Boolean.parseBoolean(dbAuditIsActive.trim());
- } catch (NumberFormatException e) {
- logger.warn("DbAudit.invoke: Ignoring invalid property: db.audit.is.active = " + dbAuditIsActive);
- }
- }
-
- if(!isActive){
- logger.info("DbAudit.invoke: exiting because isActive = " + isActive);
- return;
- }
-
- // fetch DB properties from properties file -- they are already known
- // to exist, because they were verified by the 'IntegrityMonitor'
- // constructor
- String url = droolsPersistenceProperties.getProperty(DroolsPersistenceProperties.DB_URL);
- String user = droolsPersistenceProperties.getProperty(DroolsPersistenceProperties.DB_USER);
- String password =
- droolsPersistenceProperties.getProperty(DroolsPersistenceProperties.DB_PWD);
-
- // connection to DB
- Connection connection = null;
-
- // supports SQL operations
- PreparedStatement statement = null;
- ResultSet rs = null;
-
- // operation phase currently running -- used to construct an error
- // message, if needed
- String phase = null;
-
- try
- {
- // create connection to DB
- phase = "creating connection";
- logger.info("DbAudit: Creating connection to " + url);
-
- connection = DriverManager.getConnection(url, user, password);
-
- // create audit table, if needed
- if (createTableNeeded)
- {
- phase = "create table";
- logger.info("DbAudit: Creating 'Audit' table, if needed");
- statement = connection.prepareStatement
- ("CREATE TABLE IF NOT EXISTS Audit (\n"
- + " name varchar(64) DEFAULT NULL,\n"
- + " UNIQUE KEY name (name)\n"
- + ") DEFAULT CHARSET=latin1;");
- statement.execute();
- statement.close();
- createTableNeeded = false;
- }
-
- // insert an entry into the table
- phase = "insert entry";
- String key = UUID.randomUUID().toString();
- statement = connection.prepareStatement
- ("INSERT INTO Audit (name) VALUES (?)");
- statement.setString(1, key);
- statement.executeUpdate();
- statement.close();
-
- // fetch the entry from the table
- phase = "fetch entry";
- statement = connection.prepareStatement
- ("SELECT name FROM Audit WHERE name = ?");
- statement.setString(1, key);
- rs = statement.executeQuery();
- if (rs.first())
- {
- // found entry
- logger.info("DbAudit: Found key " + rs.getString(1));
- }
- else
- {
- logger.error
- ("DbAudit: can't find newly-created entry with key " + key);
- setResponse("Can't find newly-created entry");
- }
- statement.close();
-
- // delete entries from table
- phase = "delete entry";
- statement = connection.prepareStatement
- ("DELETE FROM Audit WHERE name = ?");
- statement.setString(1, key);
- statement.executeUpdate();
- statement.close();
- statement = null;
- }
- catch (Exception e)
- {
- String message = "DbAudit: Exception during audit, phase = " + phase;
- logger.error(MessageCodes.EXCEPTION_ERROR, e, message);
- setResponse(message);
- }
- finally
- {
- if (rs != null)
- {
- try
- {
- rs.close();
- }
- catch (Exception e)
- {
- }
- }
- if (statement != null)
- {
- try
- {
- statement.close();
- }
- catch (Exception e)
- {
- }
- }
- if (connection != null)
- {
- try
- {
- connection.close();
- }
- catch (Exception e)
- {
- }
- }
- }
- }
-}
diff --git a/policy-persistence/src/main/java/org/openecomp/policy/drools/core/DroolsPDPIntegrityMonitor.java b/policy-persistence/src/main/java/org/openecomp/policy/drools/core/DroolsPDPIntegrityMonitor.java
deleted file mode 100644
index dc63d71..0000000
--- a/policy-persistence/src/main/java/org/openecomp/policy/drools/core/DroolsPDPIntegrityMonitor.java
+++ /dev/null
@@ -1,439 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.policy.drools.core;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.Properties;
-
-import org.openecomp.policy.common.im.IntegrityMonitor;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.common.logging.flexlogger.PropertyUtil;
-import org.openecomp.policy.drools.http.server.HttpServletServer;
-import org.openecomp.policy.drools.persistence.XacmlPersistenceProperties;
-import org.openecomp.policy.drools.properties.Startable;
-
-/**
- * This class extends 'IntegrityMonitor' for use in the 'Drools PDP'
- * virtual machine. The included audits are 'Database' and 'Repository'.
- */
-public class DroolsPDPIntegrityMonitor extends IntegrityMonitor
-{
-
- // get an instance of logger
- private static Logger logger = FlexLogger.getLogger(DroolsPDPIntegrityMonitor.class);
-
- // static global instance
- static private DroolsPDPIntegrityMonitor im = null;
-
- // list of audits to run
- static private AuditBase[] audits =
- new AuditBase[]{DbAudit.getInstance(), RepositoryAudit.getInstance()};
-
- // save initialization properties
- private Properties droolsPersistenceProperties = null;
-
- /**
- * Static initialization -- create Drools Integrity Monitor, and
- * an HTTP server to handle REST 'test' requests
- */
- static public DroolsPDPIntegrityMonitor init(String configDir) throws Exception
- {
-
- logger.info("init: Entering and invoking PropertyUtil.getProperties() on '"
- + configDir + "'");
-
- // read in properties
- Properties integrityMonitorProperties =
- PropertyUtil.getProperties(configDir + "/IntegrityMonitor.properties");
- Properties droolsPersistenceProperties =
- PropertyUtil.getProperties(configDir + "/droolsPersistence.properties");
- Properties xacmlPersistenceProperties =
- PropertyUtil.getProperties(configDir + "/xacmlPersistence.properties");
-
- // fetch and verify definitions of some properties
- // (the 'IntegrityMonitor' constructor does some additional verification)
- String resourceName = integrityMonitorProperties.getProperty("resource.name");
- String hostPort = integrityMonitorProperties.getProperty("hostPort");
- String fpMonitorInterval = integrityMonitorProperties.getProperty("fp_monitor_interval");
- String failedCounterThreshold = integrityMonitorProperties.getProperty("failed_counter_threshold");
- String testTransInterval = integrityMonitorProperties.getProperty("test_trans_interval");
- String writeFpcInterval = integrityMonitorProperties.getProperty("write_fpc_interval");
- String siteName = integrityMonitorProperties.getProperty("site_name");
- String nodeType = integrityMonitorProperties.getProperty("node_type");
- String dependencyGroups = integrityMonitorProperties.getProperty("dependency_groups");
- String droolsJavaxPersistenceJdbcDriver = droolsPersistenceProperties.getProperty("javax.persistence.jdbc.driver");
- String droolsJavaxPersistenceJdbcUrl = droolsPersistenceProperties.getProperty("javax.persistence.jdbc.url");
- String droolsJavaxPersistenceJdbcUser = droolsPersistenceProperties.getProperty("javax.persistence.jdbc.user");
- String droolsJavaxPersistenceJdbcPassword = droolsPersistenceProperties.getProperty("javax.persistence.jdbc.password");
- String xacmlJavaxPersistenceJdbcDriver = xacmlPersistenceProperties.getProperty("javax.persistence.jdbc.driver");
- String xacmlJavaxPersistenceJdbcUrl = xacmlPersistenceProperties.getProperty("javax.persistence.jdbc.url");
- String xacmlJavaxPersistenceJdbcUser = xacmlPersistenceProperties.getProperty("javax.persistence.jdbc.user");
- String xacmlJavaxPersistenceJdbcPassword = xacmlPersistenceProperties.getProperty("javax.persistence.jdbc.password");
-
- if (resourceName == null)
- {
- logger.error("init: Missing IntegrityMonitor property: 'resource.name'");
- throw(new Exception
- ("Missing IntegrityMonitor property: 'resource.name'"));
- }
- if (hostPort == null)
- {
- logger.error("init: Missing IntegrityMonitor property: 'hostPort'");
- throw(new Exception
- ("Missing IntegrityMonitor property: 'hostPort'"));
- }
- if (fpMonitorInterval == null)
- {
- logger.error("init: Missing IntegrityMonitor property: 'fp_monitor_interval'");
- throw(new Exception
- ("Missing IntegrityMonitor property: 'fp_monitor_interval'"));
- }
- if (failedCounterThreshold == null)
- {
- logger.error("init: Missing IntegrityMonitor property: 'failed_counter_threshold'");
- throw(new Exception
- ("Missing IntegrityMonitor property: 'failed_counter_threshold'"));
- }
- if (testTransInterval == null)
- {
- logger.error("init: Missing IntegrityMonitor property: 'test_trans_interval'");
- throw(new Exception
- ("Missing IntegrityMonitor property: 'test_trans_interval'"));
- }
- if (writeFpcInterval == null)
- {
- logger.error("init: Missing IntegrityMonitor property: 'write_fpc_interval'");
- throw(new Exception
- ("Missing IntegrityMonitor property: 'write_fpc_interval'"));
- }
- if (siteName == null)
- {
- logger.error("init: Missing IntegrityMonitor property: 'site_name'");
- throw(new Exception
- ("Missing IntegrityMonitor property: 'site_name'"));
- }
- if (nodeType == null)
- {
- logger.error("init: Missing IntegrityMonitor property: 'node_type'");
- throw(new Exception
- ("Missing IntegrityMonitor property: 'node_type'"));
- }
- if (dependencyGroups == null)
- {
- logger.error("init: Missing IntegrityMonitor property: 'dependency_groups'");
- throw(new Exception
- ("Missing IntegrityMonitor property: 'dependency_groups'"));
- }
- if (droolsJavaxPersistenceJdbcDriver == null)
- {
- logger.error("init: Missing IntegrityMonitor property: 'javax.persistence.jbdc.driver for drools DB'");
- throw(new Exception
- ("Missing IntegrityMonitor property: 'javax.persistence.jbdc.driver for drools DB'"));
- }
- if (droolsJavaxPersistenceJdbcUrl == null)
- {
- logger.error("init: Missing IntegrityMonitor property: 'javax.persistence.jbdc.url for drools DB'");
- throw(new Exception
- ("Missing IntegrityMonitor property: 'javax.persistence.jbdc.url for drools DB'"));
- }
- if (droolsJavaxPersistenceJdbcUser == null)
- {
- logger.error("init: Missing IntegrityMonitor property: 'javax.persistence.jbdc.user for drools DB'");
- throw(new Exception
- ("Missing IntegrityMonitor property: 'javax.persistence.jbdc.user for drools DB'"));
- }
- if (droolsJavaxPersistenceJdbcPassword == null)
- {
- logger.error("init: Missing IntegrityMonitor property: 'javax.persistence.jbdc.password for drools DB'");
- throw(new Exception
- ("Missing IntegrityMonitor property: 'javax.persistence.jbdc.password for drools DB'"));
- }
- if (xacmlJavaxPersistenceJdbcDriver == null)
- {
- logger.error("init: Missing IntegrityMonitor property: 'javax.persistence.jbdc.driver for xacml DB'");
- throw(new Exception
- ("Missing IntegrityMonitor property: 'javax.persistence.jbdc.driver for xacml DB'"));
- }
- if (xacmlJavaxPersistenceJdbcUrl == null)
- {
- logger.error("init: Missing IntegrityMonitor property: 'javax.persistence.jbdc.url for xacml DB'");
- throw(new Exception
- ("Missing IntegrityMonitor property: 'javax.persistence.jbdc.url for xacml DB'"));
- }
- if (xacmlJavaxPersistenceJdbcUser == null)
- {
- logger.error("init: Missing IntegrityMonitor property: 'javax.persistence.jbdc.user for xacml DB'");
- throw(new Exception
- ("Missing IntegrityMonitor property: 'javax.persistence.jbdc.user for xacml DB'"));
- }
- if (xacmlJavaxPersistenceJdbcPassword == null)
- {
- logger.error("init: Missing IntegrityMonitor property: 'javax.persistence.jbdc.password for xacml DB'");
- throw(new Exception
- ("Missing IntegrityMonitor property: 'javax.persistence.jbdc.password' for xacml DB'"));
- }
-
- logger.info("init: loading consolidatedProperties");
- Properties consolidatedProperties = new Properties();
- consolidatedProperties.load(new FileInputStream(new File(configDir + "/IntegrityMonitor.properties")));
- consolidatedProperties.load(new FileInputStream(new File(configDir + "/xacmlPersistence.properties")));
- // verify that consolidatedProperties has properties from both properties files.
- logger.info("init: PDP_INSTANCE_ID=" + consolidatedProperties.getProperty(IntegrityMonitorProperties.PDP_INSTANCE_ID));
- logger.info("init: DB_URL=" + consolidatedProperties.getProperty(XacmlPersistenceProperties.DB_URL));
-
- // Now that we've validated the properties, create Drools Integrity Monitor
- // with these properties.
- im = new DroolsPDPIntegrityMonitor(resourceName,
- consolidatedProperties, droolsPersistenceProperties);
- logger.info("init: New DroolsPDPIntegrityMonitor instantiated, hostPort=" + hostPort);
-
- // determine host and port for HTTP server
- int index = hostPort.lastIndexOf(':');
- InetSocketAddress addr;
-
- if (index < 0)
- {
- addr = new InetSocketAddress(Integer.valueOf(hostPort));
- }
- else
- {
- addr = new InetSocketAddress
- (hostPort.substring(0, index),
- Integer.valueOf(hostPort.substring(index + 1)));
- }
-
- // create http server
- try {
- logger.info("init: Starting HTTP server, addr=" + addr);
- IntegrityMonitorRestServer server = new IntegrityMonitorRestServer();
-
- server.init(integrityMonitorProperties);
-
- System.out.println("init: Started server on hostPort=" + hostPort);
- } catch (Exception e) {
- if (PolicyContainer.isUnitTesting) {
- System.out
- .println("init: Caught Exception attempting to start server on hostPort="
- + hostPort + ", message=" + e.getMessage());
- } else {
- throw e;
- }
- }
-
- logger.info("init: Exiting and returning DroolsPDPIntegrityMonitor");
- return im;
- }
-
- /**
- * Constructor - pass arguments to superclass, but remember properties
- * @param resourceName unique name of this Integrity Monitor
- * @param url the JMX URL of the MBean server
- * @param properties properties used locally, as well as by
- * 'IntegrityMonitor'
- * @throws Exception (passed from superclass)
- */
- private DroolsPDPIntegrityMonitor(String resourceName,
- Properties consolidatedProperties,
- Properties droolsPersistenceProperties) throws Exception {
- super(resourceName, consolidatedProperties);
- this.droolsPersistenceProperties = droolsPersistenceProperties;
- }
-
- /**
- * Run tests (audits) unique to Drools PDP VM (Database + Repository)
- */
- @Override
- public void subsystemTest() throws Exception
- {
- logger.info("DroolsPDPIntegrityMonitor.subsystemTest called");
-
- // clear all responses (non-null values indicate an error)
- for (AuditBase audit : audits)
- {
- audit.setResponse(null);
- }
-
- // invoke all of the audits
- for (AuditBase audit : audits)
- {
- try
- {
- // invoke the audit (responses are stored within the audit object)
- audit.invoke(droolsPersistenceProperties);
- }
- catch (Exception e)
- {
- logger.error(MessageCodes.EXCEPTION_ERROR, e,
- audit.getName() + " audit error");
- if (audit.getResponse() == null)
- {
- // if there is no current response, use the exception message
- audit.setResponse(e.getMessage());
- }
- }
- }
-
- // will contain list of subsystems where the audit failed
- String responseMsg = "";
-
- // Loop through all of the audits, and see which ones have failed.
- // NOTE: response information is stored within the audit objects
- // themselves -- only one can run at a time.
- for (AuditBase audit : audits)
- {
- String response = audit.getResponse();
- if (response != null)
- {
- // the audit has failed -- add subsystem and
- // and 'responseValue' with the new information
- responseMsg = responseMsg.concat("\n" + audit.getName() + ": " + response);
- }
- }
-
- if(!responseMsg.isEmpty()){
- throw new Exception(responseMsg);
- }
- }
-
- /* ============================================================ */
-
- /**
- * This is the base class for audits invoked in 'subsystemTest'
- */
- static public abstract class AuditBase
- {
- // name of the audit
- protected String name;
-
- // non-null indicates the error response
- protected String response;
-
- /**
- * Constructor - initialize the name, and clear the initial response
- * @param name name of the audit
- */
- public AuditBase(String name)
- {
- this.name = name;
- this.response = null;
- }
-
- /**
- * @return the name of this audit
- */
- public String getName()
- {
- return(name);
- }
-
- /**
- * @return the response String (non-null indicates the error message)
- */
- public String getResponse()
- {
- return(response);
- }
-
- /**
- * Set the response string to the specified value
- * @param value the new value of the response string (null = no errors)
- */
- public void setResponse(String value)
- {
- response = value;
- }
-
- /**
- * Abstract method to invoke the audit
- * @param droolsPersistenceProperties Used for DB access
- * @throws Exception passed in by the audit
- */
- abstract void invoke(Properties droolsPersistenceProperties) throws Exception;
- }
-
- public static class IntegrityMonitorRestServer implements Startable {
- protected volatile HttpServletServer server = null;
- protected volatile Properties integrityMonitorRestServerProperties = null;
-
- public void init(Properties props) {
- this.integrityMonitorRestServerProperties = props;
- this.start();
- }
-
- @Override
- public boolean start() throws IllegalStateException {
- try {
- ArrayList<HttpServletServer> servers = HttpServletServer.factory.build(integrityMonitorRestServerProperties);
-
- if (!servers.isEmpty()) {
- server = servers.get(0);
-
- try {
- server.start();
- } catch (Exception e) {
- e.printStackTrace();
- }
- }
- } catch (Exception e) {
- return false;
- }
-
- return true;
- }
-
- @Override
- public boolean stop() throws IllegalStateException {
- try {
- server.stop();
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- return true;
- }
-
- @Override
- public void shutdown() throws IllegalStateException {
- this.stop();
- }
-
- @Override
- public synchronized boolean isAlive() {
- return this.integrityMonitorRestServerProperties != null;
- }
- }
-
- public static DroolsPDPIntegrityMonitor getInstance() throws Exception{
- logger.info("getInstance() called");
- if (im == null) {
- String msg = "No DroolsPDPIntegrityMonitor instance exists."
- + " Please use the method DroolsPDPIntegrityMonitor init(String configDir)";
- throw new Exception(msg);
- }else{
- return im;
- }
- }
-}
diff --git a/policy-persistence/src/main/java/org/openecomp/policy/drools/core/IntegrityMonitorProperties.java b/policy-persistence/src/main/java/org/openecomp/policy/drools/core/IntegrityMonitorProperties.java
deleted file mode 100644
index e0df4e6..0000000
--- a/policy-persistence/src/main/java/org/openecomp/policy/drools/core/IntegrityMonitorProperties.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.policy.drools.core;
-
-import java.util.Properties;
-
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-
-public class IntegrityMonitorProperties {
- // get an instance of logger
- private static Logger logger = FlexLogger.getLogger(IntegrityMonitorProperties.class);
-
- public static final String PDP_INSTANCE_ID = "resource.name";
-
- public static final String PDP_CHECK_INVERVAL = "pdp.checkInterval";
- public static final String PDP_UPDATE_INTERVAL = "pdp.updateInterval";
- public static final String PDP_TIMEOUT = "pdp.timeout";
- public static final String PDP_INITIAL_WAIT_PERIOD = "pdp.initialWait";
-
- public static final String SITE_NAME = "site_name";
-
- private static Properties properties = null;
- /*
- * Initialize the parameter values from the droolsPersitence.properties file values
- *
- * This is designed so that the Properties object is obtained from the droolsPersistence.properties
- * file and then is passed to this method to initialize the value of the parameters.
- * This allows the flexibility of JUnit tests using getProperties(filename) to get the
- * properties while runtime methods can use getPropertiesFromClassPath(filename).
- *
- */
- public static void initProperties (Properties prop){
- logger.info("IntegrityMonitorProperties.initProperties(Properties): entry");
- logger.info("\n\nIntegrityMonitorProperties.initProperties: Properties = \n" + prop + "\n\n");
-
- properties = prop;
- }
-
- public static String getProperty(String key){
- return properties.getProperty(key);
- }
-
- public static Properties getProperties() {
- return properties;
- }
-}
diff --git a/policy-persistence/src/main/java/org/openecomp/policy/drools/core/IntegrityMonitorRestManager.java b/policy-persistence/src/main/java/org/openecomp/policy/drools/core/IntegrityMonitorRestManager.java
deleted file mode 100644
index 86b41de..0000000
--- a/policy-persistence/src/main/java/org/openecomp/policy/drools/core/IntegrityMonitorRestManager.java
+++ /dev/null
@@ -1,111 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.policy.drools.core;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.core.Response;
-
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-
-@Api(value = "test")
- @Path("/")
-public class IntegrityMonitorRestManager {
- private static Logger logger = FlexLogger.getLogger(IntegrityMonitorRestManager.class);
- private DroolsPDPIntegrityMonitor im;
-
- /**
- * Test interface for Integrity Monitor
- *
- * @return Exception message if exception, otherwise empty
- */
- @ApiOperation(
- value = "Test endpoint for integrity monitor",
- notes = "The TEST command is used to request data from a subcomponent "
- + "instance that can be used to determine its operational state. "
- + "A 200/success response status code should be returned if the "
- + "subcomponent instance is functioning properly and able to respond to requests.",
- response = String.class)
- @ApiResponses(value = {
- @ApiResponse(
- code = 200,
- message = "Integrity monitor sanity check passed"),
- @ApiResponse(
- code = 500,
- message = "Integrity monitor sanity check encountered an exception. This can indicate operational state disabled or administrative state locked")
- })
- @GET
- @Path("test")
- public Response test() {
- logger.error("integrity monitor /test accessed");
- // The responses are stored within the audit objects, so we need to
- // invoke the audits and get responses before we handle another
- // request.
- synchronized (IntegrityMonitorRestManager.class) {
- // will include messages associated with subsystem failures
- StringBuilder body = new StringBuilder();
-
- // 200=SUCCESS, 500=failure
- int responseValue = 200;
-
- if (im == null) {
- try {
- im = DroolsPDPIntegrityMonitor.getInstance();
- } catch (Exception e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
-
- body.append("\nException: " + e + "\n");
- responseValue = 500;
- }
- }
-
- if (im != null) {
- try {
- // call 'IntegrityMonitor.evaluateSanity()'
- im.evaluateSanity();
- } catch (Exception e) {
- // this exception isn't coming from one of the audits,
- // because those are caught in 'subsystemTest()'
- logger.error(MessageCodes.EXCEPTION_ERROR, e, "DroolsPDPIntegrityMonitor.evaluateSanity()");
-
- // include exception in HTTP response
- body.append("\nException: " + e + "\n");
- responseValue = 500;
- }
- }
-
- // send response, including the contents of 'body'
- // (which is empty if everything is successful)
- if (responseValue == 200)
- return Response.status(Response.Status.OK).build();
- else
- return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(body.toString()).build();
- }
- }
-}
diff --git a/policy-persistence/src/main/java/org/openecomp/policy/drools/core/RepositoryAudit.java b/policy-persistence/src/main/java/org/openecomp/policy/drools/core/RepositoryAudit.java
deleted file mode 100644
index 76dadd9..0000000
--- a/policy-persistence/src/main/java/org/openecomp/policy/drools/core/RepositoryAudit.java
+++ /dev/null
@@ -1,553 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.policy.drools.core;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.file.FileVisitResult;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
-import java.util.LinkedList;
-import java.util.Properties;
-import java.util.concurrent.TimeUnit;
-
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-
-
-/**
- * This class audits the Maven repository
- */
-public class RepositoryAudit extends DroolsPDPIntegrityMonitor.AuditBase
-{
- private static final long DEFAULT_TIMEOUT = 60; // timeout in 60 seconds
-
- // get an instance of logger
- private static Logger logger = FlexLogger.getLogger(RepositoryAudit.class);
- // single global instance of this audit object
- static private RepositoryAudit instance = new RepositoryAudit();
-
- /**
- * @return the single 'RepositoryAudit' instance
- */
- static DroolsPDPIntegrityMonitor.AuditBase getInstance()
- {
- return(instance);
- }
-
- /**
- * Constructor - set the name to 'Repository'
- */
- private RepositoryAudit()
- {
- super("Repository");
- }
-
- /**
- * Invoke the audit
- *
- * @param properties properties to be passed to the audit
- */
- @Override
- public void invoke(Properties properties)
- throws IOException, InterruptedException
- {
- logger.info("Running 'RepositoryAudit.invoke'");
-
- boolean isActive = true;
- boolean ignoreErrors = true; // ignore errors by default
- String repoAuditIsActive = IntegrityMonitorProperties.getProperty("repository.audit.is.active");
- String repoAuditIgnoreErrors =
- IntegrityMonitorProperties.getProperty("repository.audit.ignore.errors");
- logger.debug("RepositoryAudit.invoke: repoAuditIsActive = " + repoAuditIsActive
- + ", repoAuditIgnoreErrors = " + repoAuditIgnoreErrors);
-
- if (repoAuditIsActive != null) {
- try {
- isActive = Boolean.parseBoolean(repoAuditIsActive.trim());
- } catch (NumberFormatException e) {
- logger.warn("RepositoryAudit.invoke: Ignoring invalid property: repository.audit.is.active = " + repoAuditIsActive);
- }
- }
-
- if(!isActive){
- logger.info("RepositoryAudit.invoke: exiting because isActive = " + isActive);
- return;
- }
-
- if (repoAuditIgnoreErrors != null)
- {
- try
- {
- ignoreErrors = Boolean.parseBoolean(repoAuditIgnoreErrors.trim());
- }
- catch (NumberFormatException e)
- {
- logger.warn("RepositoryAudit.invoke: Ignoring invalid property: repository.audit.ignore.errors = " + repoAuditIgnoreErrors);
- }
- }
-
- // Fetch repository information from 'IntegrityMonitorProperties'
- String repositoryId =
- IntegrityMonitorProperties.getProperty("repository.audit.id");
- String repositoryUrl =
- IntegrityMonitorProperties.getProperty("repository.audit.url");
- String repositoryUsername =
- IntegrityMonitorProperties.getProperty("repository.audit.username");
- String repositoryPassword =
- IntegrityMonitorProperties.getProperty("repository.audit.password");
- boolean upload =
- (repositoryId != null && repositoryUrl != null
- && repositoryUsername != null && repositoryPassword != null);
-
- // used to incrementally construct response as problems occur
- // (empty = no problems)
- StringBuilder response = new StringBuilder();
-
- long timeoutInSeconds = DEFAULT_TIMEOUT;
- String timeoutString =
- IntegrityMonitorProperties.getProperty("repository.audit.timeout");
- if (timeoutString != null && !timeoutString.isEmpty())
- {
- try
- {
- timeoutInSeconds = Long.valueOf(timeoutString);
- }
- catch (NumberFormatException e)
- {
- logger.error
- ("RepositoryAudit: Invalid 'repository.audit.timeout' value: '"
- + timeoutString + "'");
- if (!ignoreErrors)
- {
- response.append("Invalid 'repository.audit.timeout' value: '")
- .append(timeoutString).append("'\n");
- setResponse(response.toString());
- }
- }
- }
-
- // artifacts to be downloaded
- LinkedList<Artifact> artifacts = new LinkedList<Artifact>();
-
- /*
- * 1) create temporary directory
- */
- Path dir = Files.createTempDirectory("auditRepo");
- logger.info("RepositoryAudit: temporary directory = " + dir);
-
- // nested 'pom.xml' file and 'repo' directory
- Path pom = dir.resolve("pom.xml");
- Path repo = dir.resolve("repo");
-
- /*
- * 2) Create test file, and upload to repository
- * (only if repository information is specified)
- */
- String groupId = null;
- String artifactId = null;
- String version = null;
- if (upload)
- {
- groupId = "org.openecomp.policy.audit";
- artifactId = "repository-audit";
- version = "0." + System.currentTimeMillis();
-
- if (repositoryUrl.toLowerCase().contains("snapshot"))
- {
- // use SNAPSHOT version
- version += "-SNAPSHOT";
- }
-
- // create text file to write
- FileOutputStream fos =
- new FileOutputStream(dir.resolve("repository-audit.txt").toFile());
- try
- {
- fos.write(version.getBytes());
- }
- finally
- {
- fos.close();
- }
-
- // try to install file in repository
- if (runProcess
- (timeoutInSeconds, dir.toFile(), null,
- "mvn", "deploy:deploy-file",
- "-DrepositoryId=" + repositoryId,
- "-Durl=" + repositoryUrl,
- "-Dfile=repository-audit.txt",
- "-DgroupId=" + groupId,
- "-DartifactId=" + artifactId,
- "-Dversion=" + version,
- "-Dpackaging=txt",
- "-DgeneratePom=false") != 0)
- {
- logger.error
- ("RepositoryAudit: 'mvn deploy:deploy-file' failed");
- if (!ignoreErrors)
- {
- response.append("'mvn deploy:deploy-file' failed\n");
- setResponse(response.toString());
- }
- }
- else
- {
- logger.info
- ("RepositoryAudit: 'mvn deploy:deploy-file succeeded");
-
- // we also want to include this new artifact in the download
- // test (steps 3 and 4)
- artifacts.add(new Artifact(groupId, artifactId, version, "txt"));
- }
- }
-
- /*
- * 3) create 'pom.xml' file in temporary directory
- */
- artifacts.add(new Artifact("org.apache.maven/maven-embedder/3.2.2"));
-
- StringBuilder sb = new StringBuilder();
- sb.append
- ("<project xmlns=\"http://maven.apache.org/POM/4.0.0\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"
- + " xsi:schemaLocation=\"http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd\">\n"
- + "\n"
- + " <modelVersion>4.0.0</modelVersion>\n"
- + " <groupId>empty</groupId>\n"
- + " <artifactId>empty</artifactId>\n"
- + " <version>1.0-SNAPSHOT</version>\n"
- + " <packaging>pom</packaging>\n"
- + "\n"
- + " <build>\n"
- + " <plugins>\n"
- + " <plugin>\n"
- + " <groupId>org.apache.maven.plugins</groupId>\n"
- + " <artifactId>maven-dependency-plugin</artifactId>\n"
- + " <version>2.10</version>\n"
- + " <executions>\n"
- + " <execution>\n"
- + " <id>copy</id>\n"
- + " <goals>\n"
- + " <goal>copy</goal>\n"
- + " </goals>\n"
- + " <configuration>\n"
- + " <localRepositoryDirectory>")
- .append(repo)
- .append("</localRepositoryDirectory>\n")
- .append(" <artifactItems>\n");
- for (Artifact artifact : artifacts)
- {
- // each artifact results in an 'artifactItem' element
- sb.append
- (" <artifactItem>\n"
- + " <groupId>")
- .append(artifact.groupId)
- .append
- ("</groupId>\n"
- + " <artifactId>")
- .append(artifact.artifactId)
- .append
- ("</artifactId>\n"
- + " <version>")
- .append(artifact.version)
- .append
- ("</version>\n"
- + " <type>")
- .append(artifact.type)
- .append
- ("</type>\n"
- + " </artifactItem>\n");
- }
- sb.append
- (" </artifactItems>\n"
- + " </configuration>\n"
- + " </execution>\n"
- + " </executions>\n"
- + " </plugin>\n"
- + " </plugins>\n"
- + " </build>\n"
- + "</project>\n");
- FileOutputStream fos = new FileOutputStream(pom.toFile());
- try
- {
- fos.write(sb.toString().getBytes());
- }
- finally
- {
- fos.close();
- }
-
- /*
- * 4) Invoke external 'mvn' process to do the downloads
- */
-
- // output file = ${dir}/out (this supports step '4a')
- File output = dir.resolve("out").toFile();
-
- // invoke process, and wait for response
- int rval = runProcess
- (timeoutInSeconds, dir.toFile(), output, "mvn", "compile");
- logger.info("RepositoryAudit: 'mvn' return value = " + rval);
- if (rval != 0)
- {
- logger.error
- ("RepositoryAudit: 'mvn compile' invocation failed");
- if (!ignoreErrors)
- {
- response.append("'mvn compile' invocation failed\n");
- setResponse(response.toString());
- }
- }
-
- /*
- * 4a) Check attempted and successful downloads from output file
- * Note: at present, this step just generates log messages,
- * but doesn't do any verification.
- */
- if (rval == 0)
- {
- // place output in 'fileContents' (replacing the Return characters
- // with Newline)
- byte[] outputData = new byte[(int)output.length()];
- FileInputStream fis = new FileInputStream(output);
- fis.read(outputData);
- String fileContents = new String(outputData).replace('\r','\n');
- fis.close();
-
- // generate log messages from 'Downloading' and 'Downloaded'
- // messages within the 'mvn' output
- int index = 0;
- while ((index = fileContents.indexOf("\nDown", index)) > 0)
- {
- index += 5;
- if (fileContents.regionMatches(index, "loading: ", 0, 9))
- {
- index += 9;
- int endIndex = fileContents.indexOf('\n', index);
- logger.info
- ("RepositoryAudit: Attempted download: '"
- + fileContents.substring(index, endIndex) + "'");
- index = endIndex;
- }
- else if (fileContents.regionMatches(index, "loaded: ", 0, 8))
- {
- index += 8;
- int endIndex = fileContents.indexOf(' ', index);
- logger.info
- ("RepositoryAudit: Successful download: '"
- + fileContents.substring(index, endIndex) + "'");
- index = endIndex;
- }
- }
- }
-
- /*
- * 5) Check the contents of the directory to make sure the downloads
- * were successful
- */
- for (Artifact artifact : artifacts)
- {
- if (repo.resolve(artifact.groupId.replace('.','/'))
- .resolve(artifact.artifactId)
- .resolve(artifact.version)
- .resolve(artifact.artifactId + "-" + artifact.version + "."
- + artifact.type).toFile().exists())
- {
- // artifact exists, as expected
- logger.info("RepositoryAudit: "
- + artifact.toString() + ": exists");
- }
- else
- {
- // Audit ERROR: artifact download failed for some reason
- logger.error("RepositoryAudit: "
- + artifact.toString() + ": does not exist");
- if (!ignoreErrors)
- {
- response.append("Failed to download artifact: ")
- .append(artifact).append('\n');
- setResponse(response.toString());
- }
- }
- }
-
- /*
- * 6) Use 'curl' to delete the uploaded test file
- * (only if repository information is specified)
- */
- if (upload)
- {
- if (runProcess
- (timeoutInSeconds, dir.toFile(), null,
- "curl",
- "--request", "DELETE",
- "--user", repositoryUsername + ":" + repositoryPassword,
- (repositoryUrl + "/" + groupId.replace('.', '/') + "/" +
- artifactId + "/" + version))
- != 0)
- {
- logger.error
- ("RepositoryAudit: delete of uploaded artifact failed");
- if (!ignoreErrors)
- {
- response.append("delete of uploaded artifact failed\n");
- setResponse(response.toString());
- }
- }
- else
- {
- logger.info
- ("RepositoryAudit: delete of uploaded artifact succeeded");
- artifacts.add(new Artifact(groupId, artifactId, version, "txt"));
- }
- }
-
- /*
- * 7) Remove the temporary directory
- */
- Files.walkFileTree
- (dir,
- new SimpleFileVisitor<Path>()
- {
- public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
- {
- // logger.info("RepositoryAudit: Delete " + file);
- file.toFile().delete();
- return(FileVisitResult.CONTINUE);
- }
-
- public FileVisitResult postVisitDirectory(Path file, IOException e)
- throws IOException
- {
- if (e == null)
- {
- // logger.info("RepositoryAudit: Delete " + file);
- file.toFile().delete();
- return(FileVisitResult.CONTINUE);
- }
- else
- {
- throw(e);
- }
- }
- });
- }
-
- /**
- * Run a process, and wait for the response
- *
- * @param timeoutInSeconds the number of seconds to wait for the
- * process to terminate
- * @param directory the execution directory of the process
- * (null = current directory)
- * @param stdout the file to contain the standard output
- * (null = discard standard output)
- * @param command command and arguments
- * @return the return value of the process
- * @throws IOException, InterruptedException
- */
- static int runProcess(long timeoutInSeconds,
- File directory, File stdout, String... command)
- throws IOException, InterruptedException
- {
- ProcessBuilder pb = new ProcessBuilder(command);
- if (directory != null)
- {
- pb.directory(directory);
- }
- if (stdout != null)
- {
- pb.redirectOutput(stdout);
- }
-
- Process process = pb.start();
- if (process.waitFor(timeoutInSeconds, TimeUnit.SECONDS))
- {
- // process terminated before the timeout
- return(process.exitValue());
- }
-
- // process timed out -- kill it, and return -1
- process.destroyForcibly();
- return(-1);
- }
-
- /* ============================================================ */
-
- /**
- * An instance of this class exists for each artifact that we are trying
- * to download.
- */
- static class Artifact
- {
- String groupId, artifactId, version, type;
-
- /**
- * Constructor - populate the 'Artifact' instance
- *
- * @param groupId groupId of artifact
- * @param artifactId artifactId of artifact
- * @param version version of artifact
- * @param type type of the artifact (e.g. "jar")
- */
- Artifact(String groupId, String artifactId, String version, String type)
- {
- this.groupId = groupId;
- this.artifactId = artifactId;
- this.version = version;
- this.type = type;
- }
-
- /**
- * Constructor - populate an 'Artifact' instance
- *
- * @param artifact a string of the form:
- * "<groupId>/<artifactId>/<version>[/<type>]"
- * @throws IllegalArgumentException if 'artifact' has the incorrect format
- */
- Artifact(String artifact)
- {
- String[] segments = artifact.split("/");
- if (segments.length != 4 && segments.length != 3)
- {
- throw(new IllegalArgumentException("groupId/artifactId/version/type"));
- }
- groupId = segments[0];
- artifactId = segments[1];
- version = segments[2];
- type = (segments.length == 4 ? segments[3] : "jar");
- }
-
- /**
- * @return the artifact id in the form:
- * "<groupId>/<artifactId>/<version>/<type>"
- */
- public String toString()
- {
- return(groupId + "/" + artifactId + "/" + version + "/" + type);
- }
- }
-}
diff --git a/policy-persistence/src/main/java/org/openecomp/policy/drools/im/PMStandbyStateChangeNotifier.java b/policy-persistence/src/main/java/org/openecomp/policy/drools/im/PMStandbyStateChangeNotifier.java
deleted file mode 100644
index 3087799..0000000
--- a/policy-persistence/src/main/java/org/openecomp/policy/drools/im/PMStandbyStateChangeNotifier.java
+++ /dev/null
@@ -1,357 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.policy.drools.im;
-
-/*
- * Per MultiSite_v1-10.ppt:
- *
- * Extends the StateChangeNotifier class and overwrites the abstract handleStateChange() method to get state changes
- * and do the following:
- *
- * When the Standby Status changes (from providingservice) to hotstandby or coldstandby,
- * the Active/Standby selection algorithm must stand down if the PDP-D is currently the lead/active node
- * and allow another PDP-D to take over. It must also call lock on all engines in the engine management.
- *
- * When the Standby Status changes from (hotstandby) to coldstandby, the Active/Standby algorithm must NOT assume
- * the active/lead role.
- *
- * When the Standby Status changes (from coldstandby or providingservice) to hotstandby,
- * the Active/Standby algorithm may assume the active/lead role if the active/lead fails.
- *
- * When the Standby Status changes to providingservice (from hotstandby or coldstandby) call unlock on all
- * engines in the engine management layer.
- */
-import java.util.Date;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import org.openecomp.policy.common.im.StateChangeNotifier;
-import org.openecomp.policy.common.im.StateManagement;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.drools.core.IntegrityMonitorProperties;
-import org.openecomp.policy.drools.persistence.DroolsPdpsConnector;
-import org.openecomp.policy.drools.persistence.PersistenceFeature;
-import org.openecomp.policy.drools.system.PolicyEngine;
-
-/*
- * Some background:
- *
- * Originally, there was a "StandbyStateChangeNotifier" that belonged to policy-core, and this class's handleStateChange() method
- * used to take care of invoking conn.standDownPdp(). But testing revealed that when a state change to hot standby occurred
- * from a demote() operation, first the PMStandbyStateChangeNotifier.handleStateChange() method would be invoked and then the
- * StandbyStateChangeNotifier.handleStateChange() method would be invoked, and this ordering was creating the following problem:
- *
- * When PMStandbyStateChangeNotifier.handleStateChange() was invoked it would take a long time to finish, because it would result
- * in SingleThreadedUebTopicSource.stop() being invoked, which can potentially do a 5 second sleep for each controller being stopped.
- * Meanwhile, as these controller stoppages and their associated sleeps were occurring, the election handler would discover the
- * demoted PDP in hotstandby (but still designated!) and promote it, resulting in the standbyStatus going from hotstandby
- * to providingservice. So then, by the time that PMStandbyStateChangeNotifier.handleStateChange() finished its work and
- * StandbyStateChangeNotifier.handleStateChange() started executing, the standbyStatus was no longer hotstandby (as effected by
- * the demote), but providingservice (as reset by the election handling logic) and conn.standDownPdp() would not get called!
- *
- * To fix this bug, we consolidated StandbyStateChangeNotifier and PMStandbyStateChangeNotifier, with the standDownPdp() always
- * being invoked prior to the TopicEndpoint.manager.lock(). In this way, when the election handling logic is invoked
- * during the controller stoppages, the PDP is in hotstandby and the standdown occurs.
- *
- */
-public class PMStandbyStateChangeNotifier extends StateChangeNotifier {
- // get an instance of logger
- private static Logger logger = FlexLogger.getLogger(PMStandbyStateChangeNotifier.class);
- private Timer delayActivateTimer;
- private int pdpUpdateInterval;
- private boolean isWaitingForActivation;
- private long startTimeWaitingForActivationMs;
- private long waitInterval;
- private boolean isNowActivating;
- private String previousStandbyStatus;
- public static String NONE = "none";
- public static String UNSUPPORTED = "unsupported";
- public static String HOTSTANDBY_OR_COLDSTANDBY = "hotstandby_or_coldstandby";
-
- public PMStandbyStateChangeNotifier(){
- pdpUpdateInterval = Integer.parseInt(IntegrityMonitorProperties.getProperty(IntegrityMonitorProperties.PDP_UPDATE_INTERVAL));
- isWaitingForActivation = false;
- startTimeWaitingForActivationMs = new Date().getTime();
- //delay the activate so the DesignatedWaiter can run twice - give it an extra 2 seconds
- waitInterval = 2*pdpUpdateInterval + 2000;
- isNowActivating=false;
- previousStandbyStatus = PMStandbyStateChangeNotifier.NONE;
- }
-
- @Override
- public void handleStateChange() {
- /*
- * A note on synchronization: This method is not synchronized because the caller, stateManagememt,
- * has synchronize all of its methods. Only one stateManagement operation can occur at a time. Thus,
- * only one handleStateChange() call will ever be made at a time.
- */
- if(logger.isInfoEnabled()){
- logger.info("handleStateChange: Entering, message='"
- + super.getMessage() + "', standbyStatus='"
- + super.getStateManagement().getStandbyStatus() + "'");
- }
- String standbyStatus = super.getStateManagement().getStandbyStatus();
- String pdpId = IntegrityMonitorProperties
- .getProperty(IntegrityMonitorProperties.PDP_INSTANCE_ID);
- DroolsPdpsConnector conn = PersistenceFeature
- .getDroolsPdpsConnector("ncompPU");
-
- if(logger.isDebugEnabled()){
- logger.debug("handleStateChange: previousStandbyStatus = " + previousStandbyStatus
- + "; standbyStatus = " + standbyStatus);
- }
-
- if (standbyStatus == null || standbyStatus.equals(StateManagement.NULL_VALUE)) {
- if(logger.isInfoEnabled()){
- logger.info("handleStateChange: standbyStatus is null; standing down PDP=" + pdpId);
- }
- if(previousStandbyStatus.equals(StateManagement.NULL_VALUE)){
- //We were just here and did this successfully
- if(logger.isDebugEnabled()){
- logger.debug("handleStateChange: Is returning because standbyStatus is null and was previously 'null'; PDP=" + pdpId);
- }
- return;
- }
- isWaitingForActivation = false;
- try{
- try{
- if(logger.isInfoEnabled()){
- logger.info("handleStateChange: null: cancelling delayActivationTimer.");
- }
- delayActivateTimer.cancel();
- }catch(Exception e){
- if(logger.isInfoEnabled()){
- logger.info("handleStateChange: null no delayActivationTimer existed.");
- }
- //If you end of here, there was no active timer
- }
- conn.standDownPdp(pdpId);
- //Only want to lock the endpoints, not the controllers.
- PolicyEngine.manager.deactivate();
- //The operation was fully successful, but you cannot assign it a real null value
- //because later we might try to execute previousStandbyStatus.equals() and get
- //a null pointer exception.
- previousStandbyStatus = StateManagement.NULL_VALUE;
- }catch(Exception e){
- logger.warn("handleStateChange: standbyStatus == null caught exception: " + e);
- e.printStackTrace();
- }
- } else if (standbyStatus.equals(StateManagement.HOT_STANDBY) || standbyStatus.equals(StateManagement.COLD_STANDBY)) {
- if(logger.isInfoEnabled()){
- logger.info("handleStateChange: standbyStatus=" + standbyStatus + "; standing down PDP=" + pdpId);
- }
- if(previousStandbyStatus.equals(PMStandbyStateChangeNotifier.HOTSTANDBY_OR_COLDSTANDBY)){
- //We were just here and did this successfully
- if(logger.isDebugEnabled()){
- logger.debug("handleStateChange: Is returning because standbyStatus is "
- + standbyStatus + " and was previously " + previousStandbyStatus
- + "; PDP=" + pdpId);
- }
- return;
- }
- isWaitingForActivation = false;
- try{
- try{
- if(logger.isInfoEnabled()){
- logger.info("handleStateChange: HOT_STNDBY || COLD_STANDBY: cancelling delayActivationTimer.");
- }
- delayActivateTimer.cancel();
- }catch(Exception e){
- if(logger.isInfoEnabled()){
- logger.info("handleStateChange: HOT_STANDBY || COLD_STANDBY no delayActivationTimer existed.");
- }
- //If you end of here, there was no active timer
- }
- //Only want to lock the endpoints, not the controllers.
- conn.standDownPdp(pdpId);
- PolicyEngine.manager.deactivate();
- //The operation was fully successful
- previousStandbyStatus = PMStandbyStateChangeNotifier.HOTSTANDBY_OR_COLDSTANDBY;
- }catch(Exception e){
- logger.warn("handleStateChange: standbyStatus == " + standbyStatus + " caught exception: " + e);
- e.printStackTrace();
- }
-
- } else if (standbyStatus.equals(StateManagement.PROVIDING_SERVICE)) {
- if(logger.isInfoEnabled()){
- logger.info("handleStateChange: standbyStatus=" + standbyStatus + "; scheduling activation of PDP=" + pdpId);
- }
- if(previousStandbyStatus.equals(StateManagement.PROVIDING_SERVICE)){
- //We were just here and did this successfully
- if(logger.isDebugEnabled()){
- logger.debug("handleStateChange: Is returning because standbyStatus is "
- + standbyStatus + " and was previously " + previousStandbyStatus
- + "; PDP=" + pdpId);
- }
- return;
- }
- try{
- //UnLock all the endpoints
- if(logger.isInfoEnabled()){
- logger.info("handleStateChange: standbyStatus=" + standbyStatus + "; controllers must be unlocked.");
- }
- /*
- * Only endpoints should be unlocked. Controllers have not been locked.
- * Because, sometimes, it is possible for more than one PDP-D to become active (race conditions)
- * we need to delay the activation of the topic endpoint interfaces to give the election algorithm
- * time to resolve the conflict.
- */
- if(logger.isInfoEnabled()){
- logger.info("handleStateChange: PROVIDING_SERVICE isWaitingForActivation= " +isWaitingForActivation);
- }
- //Delay activation for 2*pdpUpdateInterval+2000 ms in case of an election handler conflict.
- //You could have multiple election handlers thinking they can take over.
-
- // First let's check that the timer has not died
- if(isWaitingForActivation){
- if(logger.isInfoEnabled()){
- logger.info("handleStateChange: PROVIDING_SERVICE isWaitingForActivation = " + isWaitingForActivation);
- }
- long now = new Date().getTime();
- long waitTimeMs = now - startTimeWaitingForActivationMs;
- if(waitTimeMs > 3*waitInterval){
- if(logger.isInfoEnabled()){
- logger.info("handleStateChange: PROVIDING_SERVICE looks like the activation wait timer may be hung,"
- + " waitTimeMs = " + waitTimeMs + " and allowable waitInterval = " + waitInterval
- + " Checking whether it is currently in activation. isNowActivating = " + isNowActivating);
- }
- //Now check that it is not currently executing an activation
- if(!isNowActivating){
- if(logger.isInfoEnabled()){
- logger.info("handleStateChange: PROVIDING_SERVICE looks like the activation wait timer died");
- }
- // This will assure the timer is cancelled and rescheduled.
- isWaitingForActivation = false;
- }
- }
-
- }
-
- if(!isWaitingForActivation){
- try{
- //Just in case there is an old timer hanging around
- if(logger.isInfoEnabled()){
- logger.info("handleStateChange: PROVIDING_SERVICE cancelling delayActivationTimer.");
- }
- delayActivateTimer.cancel();
- }catch(Exception e){
- if(logger.isInfoEnabled()){
- logger.info("handleStateChange: PROVIDING_SERVICE no delayActivationTimer existed.");
- }
- //If you end of here, there was no active timer
- }
- delayActivateTimer = new Timer();
- //delay the activate so the DesignatedWaiter can run twice
- delayActivateTimer.schedule(new DelayActivateClass(), waitInterval);
- isWaitingForActivation = true;
- startTimeWaitingForActivationMs = new Date().getTime();
- if(logger.isInfoEnabled()){
- logger.info("handleStateChange: PROVIDING_SERVICE scheduling delayActivationTimer in " + waitInterval + " ms");
- }
- }else{
- if(logger.isInfoEnabled()){
- logger.info("handleStateChange: PROVIDING_SERVICE delayActivationTimer is waiting for activation.");
- }
- }
-
- }catch(Exception e){
- logger.warn("handleStateChange: PROVIDING_SERVICE standbyStatus == providingservice caught exception: " + e);
- e.printStackTrace();
- }
-
- } else {
- logger.error("handleStateChange: Unsupported standbyStatus=" + standbyStatus + "; standing down PDP=" + pdpId);
- if(previousStandbyStatus.equals(PMStandbyStateChangeNotifier.UNSUPPORTED)){
- //We were just here and did this successfully
- if(logger.isDebugEnabled()){
- logger.debug("handleStateChange: Is returning because standbyStatus is "
- + "UNSUPPORTED and was previously " + previousStandbyStatus
- + "; PDP=" + pdpId);
- }
- return;
- }
- //Only want to lock the endpoints, not the controllers.
- isWaitingForActivation = false;
- try{
- try{
- if(logger.isInfoEnabled()){
- logger.info("handleStateChange: unsupported standbystatus: cancelling delayActivationTimer.");
- }
- delayActivateTimer.cancel();
- }catch(Exception e){
- if(logger.isInfoEnabled()){
- logger.info("handleStateChange: unsupported standbystatus: no delayActivationTimer existed.");
- }
- //If you end of here, there was no active timer
- }
- conn.standDownPdp(pdpId);
- PolicyEngine.manager.deactivate();
- //We know the standbystatus is unsupported
- previousStandbyStatus = PMStandbyStateChangeNotifier.UNSUPPORTED;
- }catch(Exception e){
- logger.warn("handleStateChange: Unsupported standbyStatus == " + standbyStatus + "caught exception: " + e);
- e.printStackTrace();
- }
- }
- if(logger.isDebugEnabled()){
- logger.debug("handleStateChange: Exiting");
- }
- }
-
- private class DelayActivateClass extends TimerTask{
-
- private Object delayActivateLock = new Object();
-
-
- @Override
- public void run() {
- isNowActivating = true;
- try{
- if(logger.isInfoEnabled()){
- logger.info("DelayActivateClass.run: entry");
- }
- synchronized(delayActivateLock){
- PolicyEngine.manager.activate();
- // The state change fully succeeded
- previousStandbyStatus = StateManagement.PROVIDING_SERVICE;
- // We want to set this to false here because the activate call can take a while
- isWaitingForActivation = false;
- isNowActivating = false;
- }
- if(logger.isInfoEnabled()){
- logger.info("DelayActivateClass.run.exit");
- }
- }catch(Exception e){
- isWaitingForActivation = false;
- isNowActivating = false;
- logger.warn("DelayActivateClass.run: caught an unexpected exception "
- + "calling PolicyEngine.manager.activate: " + e);
- System.out.println(new Date() + " DelayActivateClass.run: caught an unexpected exception");
- e.printStackTrace();
- }
- }
- }
-
- public String getPreviousStandbyStatus(){
- return previousStandbyStatus;
- }
-}
diff --git a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsPdp.java b/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsPdp.java
deleted file mode 100644
index 11cc878..0000000
--- a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsPdp.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.policy.drools.persistence;
-
-import java.util.Date;
-import java.util.List;
-
-public interface DroolsPdp {
-
- public List<DroolsSessionEntity> getSessions();
- public void addSession(DroolsSession session);
- public void removeSession(DroolsSession session);
- public String getPdpId();
- public boolean isDesignated();
- public int getPriority();
- public Date getUpdatedDate();
- public void setDesignated(boolean isDesignated);
- public void setUpdatedDate(Date updatedDate);
- public int comparePriority(DroolsPdp other);
- public int comparePriority(DroolsPdp other,String previousSite);
- public DroolsSession getSession(String sessionName);
- public void setSessionId(String sessionName, long sessionId);
- public String getSiteName();
- public void setSiteName(String siteName);
- public Date getDesignatedDate();
- public void setDesignatedDate(Date designatedDate);
-}
diff --git a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsPdpEntity.java b/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsPdpEntity.java
deleted file mode 100644
index 87b5872..0000000
--- a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsPdpEntity.java
+++ /dev/null
@@ -1,171 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.policy.drools.persistence;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.NamedQueries;
-import javax.persistence.NamedQuery;
-import javax.persistence.OneToMany;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-import org.openecomp.policy.drools.persistence.DroolsPdpObject;
-
-@Entity
-//@Table(name="DroolsPdpEntity")
-
-@NamedQueries({
- @NamedQuery(name="DroolsPdpEntity.findAll", query="SELECT e FROM DroolsPdpEntity e "),
- @NamedQuery(name="DroolsPdpEntity.deleteAll", query="DELETE FROM DroolsPdpEntity WHERE 1=1")
-})
-public class DroolsPdpEntity extends DroolsPdpObject implements Serializable{
-
- private static final long serialVersionUID = 1L;
-
- @Id
- @Column(name="pdpId", nullable=false)
- private String pdpId="-1";
-
- @Column(name="designated", nullable=false)
- private boolean designated=false;
-
- @Column(name="priority", nullable=false)
- private int priority=0;
-
- @Temporal(TemporalType.TIMESTAMP)
- @Column(name="updatedDate", nullable=false)
- private Date updatedDate;
-
- @Temporal(TemporalType.TIMESTAMP)
- @Column(name="designatedDate",nullable=false)
- private Date designatedDate;
-
- @Column(name="site", nullable=true, length = 50)
- private String site;
-
-
- @OneToMany(mappedBy="pdpEntity")
- //@OneToMany
- //@JoinColumn(name="pdpId", referencedColumnName="pdpId")
- //@JoinColumn(name="pdpId")
- private List<DroolsSessionEntity> sessions;
-
-
- public DroolsPdpEntity(){
- updatedDate = new Date();
- //When this is translated to a TimeStamp in MySQL, it assumes the date is relative
- //to the local timezone. So, a value of Date(0) is actually Dec 31 18:00:00 CST 1969
- //which is an invalid value for the MySql TimeStamp
- designatedDate = new Date(864000000);
- }
-
- @Override
- public String getPdpId() {
- return this.pdpId;
- }
-
- public void setPdpId(String pdpId) {
- this.pdpId = pdpId;
- }
-
- @Override
- public boolean isDesignated() {
- return this.designated;
- }
-
- @Override
- public int getPriority() {
- return this.priority;
- }
-
- public void setPriority(int priority) {
- this.priority = priority;
- }
-
- @Override
- public Date getUpdatedDate() {
- return this.updatedDate;
- }
-
- @Override
- public void setDesignated(boolean isDesignated) {
- this.designated=isDesignated;
- }
-
- @Override
- public void setUpdatedDate(Date updatedDate) {
- this.updatedDate=updatedDate;
- }
-
-
- public List<DroolsSessionEntity> getSessions() {
- return sessions;
- }
-
- public void addSession(DroolsSessionEntity session) {
- sessions.add(session);
- }
-
- public void removeSession(DroolsSessionEntity session) {
- sessions.remove(session);
-
- }
-
- @Override
- public void addSession(DroolsSession session) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void removeSession(DroolsSession session) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public String getSiteName() {
- return site;
- }
-
- @Override
- public void setSiteName(String siteName) {
- site = siteName;
-
- }
-
- @Override
- public Date getDesignatedDate() {
- return designatedDate;
- }
-
- @Override
- public void setDesignatedDate(Date designatedDate) {
- this.designatedDate = designatedDate;
- }
-
-}
diff --git a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsPdpImpl.java b/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsPdpImpl.java
deleted file mode 100644
index e0f5d81..0000000
--- a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsPdpImpl.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.policy.drools.persistence;
-
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-
-
-public class DroolsPdpImpl extends DroolsPdpObject {
-
- private boolean designated;
- private int priority;
- private Date updatedDate;
- private Date designatedDate;
- private String pdpId;
- private String site;
- private List<DroolsSessionEntity> sessions;
-
- public DroolsPdpImpl(String pdpId, boolean designated, int priority, Date updatedDate){
- this.pdpId = pdpId;
- this.designated = designated;
- this.priority = priority;
- this.updatedDate = updatedDate;
- //When this is translated to a TimeStamp in MySQL, it assumes the date is relative
- //to the local timezone. So, a value of Date(0) is actually Dec 31 18:00:00 CST 1969
- //which is an invalid value for the MySql TimeStamp
- this.designatedDate = new Date(864000000);
- sessions = new LinkedList<DroolsSessionEntity>();
-
- }
- @Override
- public boolean isDesignated() {
-
- return designated;
- }
-
- @Override
- public int getPriority() {
- return priority;
- }
- @Override
- public void setUpdatedDate(Date date){
- this.updatedDate = date;
- }
- @Override
- public Date getUpdatedDate() {
- return updatedDate;
- }
-
- @Override
- public String getPdpId() {
- return pdpId;
- }
- @Override
- public void setDesignated(boolean isDesignated) {
- this.designated = isDesignated;
-
- }
-
-
- @Override
- public List<DroolsSessionEntity> getSessions() {
- // TODO Auto-generated method stub
- return sessions;
- }
- @Override
- public void addSession(DroolsSession session) {
-
-
- }
- @Override
- public void removeSession(DroolsSession session) {
- // TODO Auto-generated method stub
-
- }
- @Override
- public String getSiteName() {
- return site;
- }
- @Override
- public void setSiteName(String siteName) {
- this.site = siteName;
-
- }
- @Override
- public Date getDesignatedDate() {
- return designatedDate;
- }
- @Override
- public void setDesignatedDate(Date designatedDate) {
- this.designatedDate = designatedDate;
-
- }
-
-
-}
diff --git a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsPdpObject.java b/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsPdpObject.java
deleted file mode 100644
index d9c2d48..0000000
--- a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsPdpObject.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.policy.drools.persistence;
-
-
-public abstract class DroolsPdpObject implements DroolsPdp{
-
- @Override
- public boolean equals(Object other){
- if(other instanceof DroolsPdp){
- return this.getPdpId().equals(((DroolsPdp)other).getPdpId());
- }else{
- return false;
- }
- }
- private int nullSafeCompare(String one, String two){
- if(one != null && two != null){
- return one.compareTo(two);
- }
- if(one == null && two != null){
- return -1;
- }
- if(one != null && two == null){
- return 1;
- }
- return 0;
- }
- @Override
- public int comparePriority(DroolsPdp other){
- if(nullSafeCompare(this.getSiteName(),other.getSiteName()) == 0){
- if(this.getPriority() != other.getPriority()){
- return this.getPriority() - other.getPriority();
- }
- return this.getPdpId().compareTo(other.getPdpId());
- } else {
- return nullSafeCompare(this.getSiteName(),other.getSiteName());
- }
- }
- @Override
- public int comparePriority(DroolsPdp other, String previousSite){
- if(previousSite == null || previousSite.equals("")){
- return comparePriority(other);
- }
- if(nullSafeCompare(this.getSiteName(),other.getSiteName()) == 0){
- if(this.getPriority() != other.getPriority()){
- return this.getPriority() - other.getPriority();
- }
- return this.getPdpId().compareTo(other.getPdpId());
- } else {
- return nullSafeCompare(this.getSiteName(),other.getSiteName());
- }
- }
- @Override
- public DroolsSession getSession(String sessionName){
- for(DroolsSession session : getSessions()){
- if(session.getSessionName().equals(sessionName)){
- return session;
- }
- }
- return null;
- }
- @Override
- public void setSessionId(String sessionName, long sessionId){
- for(DroolsSession session : getSessions()){
- if(session.getSessionName().equals(sessionName)){
- session.setSessionId(sessionId);
- return;
- }
- }
- DroolsSessionEntity newSession = new DroolsSessionEntity();
- DroolsPdpEntity pdpEntityWithPdpId = new DroolsPdpEntity();
- pdpEntityWithPdpId.setPdpId(this.getPdpId());
- newSession.setPdpEntity(pdpEntityWithPdpId);
- newSession.setPdpId(getPdpId());
- newSession.setSessionName(sessionName);
- newSession.setSessionId(sessionId);
- getSessions().add(newSession);
- }
-}
diff --git a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsPdpsConnector.java b/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsPdpsConnector.java
deleted file mode 100644
index fa75c2e..0000000
--- a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsPdpsConnector.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.policy.drools.persistence;
-
-import java.util.Collection;
-
-public interface DroolsPdpsConnector {
-
-
- //return a list of PDPs, NOT including this PDP
- public Collection<DroolsPdp> getDroolsPdps();
-
- public void update(DroolsPdp pdp);
-
- //determines if the DroolsPdp parameter is considered "current" or expired (has it been too long since the Pdp sent an update)
- public boolean isPdpCurrent(DroolsPdp pdp);
-
- // Updates DESIGNATED boolean in PDP record.
- public void setDesignated(DroolsPdp pdp, boolean designated);
-
- // Marks droolspdpentity.DESIGNATED=false, so another PDP-D will go active.
- public void standDownPdp(String pdpId);
-
- // This is used in a JUnit test environment to manually
- // insert a PDP
- public void insertPdp(DroolsPdp pdp);
-
- // This is used in a JUnit test environment to manually
- // delete a PDP
- public void deletePdp(String pdpId);
-
- // This is used in a JUnit test environment to manually
- // clear the droolspdpentity table.
- public void deleteAllPdps();
-
- // This is used in a JUnit test environment to manually
- // clear the droolspdpentity table.
- public void deleteAllSessions();
-
- // This is used in a JUnit test environment to manually
- // get a PDP
- public DroolsPdpEntity getPdp(String pdpId);
-
- // Used by DroolsPdpsElectionHandler to determine if the currently designated
- // PDP has failed.
- public boolean hasDesignatedPdpFailed(Collection<DroolsPdp> pdps);
-
-
-}
diff --git a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsPdpsElectionHandler.java b/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsPdpsElectionHandler.java
deleted file mode 100644
index 045c4c2..0000000
--- a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsPdpsElectionHandler.java
+++ /dev/null
@@ -1,1085 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.policy.drools.persistence;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.Timer;
-import java.util.TimerTask;
-
-import org.openecomp.policy.common.im.StandbyStatusException;
-import org.openecomp.policy.common.im.StateManagement;
-import org.openecomp.policy.drools.core.DroolsPDPIntegrityMonitor;
-import org.openecomp.policy.drools.core.IntegrityMonitorProperties;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-
-public class DroolsPdpsElectionHandler implements ThreadRunningChecker {
- // get an instance of logger
- private final static Logger logger = FlexLogger.getLogger(DroolsPdpsElectionHandler.class);
- private DroolsPdpsConnector pdpsConnector;
- private Object pdpsConnectorLock = new Object();
- private Object checkUpdateWorkerLock = new Object();
- private Object checkWaitTimerLock = new Object();
- private Object designationWaiterLock = new Object();
-
- /*
- * Must be static, so it can be referenced by JpaDroolsPdpsConnector,
- * without requiring a reference to the election handler instantiation.
- */
- private static DroolsPdp myPdp;
-
- private DesignationWaiter designationWaiter;
- private Timer updateWorker;
- private Timer waitTimer;
- private Date updateWorkerLastRunDate;
- private Date waitTimerLastRunDate;
- private int pdpCheckInterval;
- private int pdpUpdateInterval;
- private volatile boolean isDesignated;
- DroolsPDPIntegrityMonitor droolsPdpIntegrityMonitor;
- StateManagement stateManagement;
-
- public DroolsPdpsElectionHandler(DroolsPdpsConnector pdps, DroolsPdp myPdp, DroolsPDPIntegrityMonitor droolsPdpIntegrityMonitor){
- this.pdpsConnector = pdps;
- DroolsPdpsElectionHandler.myPdp = myPdp;
- this.isDesignated = false;
- this.droolsPdpIntegrityMonitor = droolsPdpIntegrityMonitor;
- this.stateManagement = droolsPdpIntegrityMonitor.getStateManager();
- pdpCheckInterval = 3000;
- try{
- pdpCheckInterval = Integer.parseInt(IntegrityMonitorProperties.getProperty(IntegrityMonitorProperties.PDP_CHECK_INVERVAL));
- }catch(Exception e){
- logger.error
- //System.out.println
- (MessageCodes.EXCEPTION_ERROR ,e, "Could not get pdpCheckInterval property. Using default");
- }
- pdpUpdateInterval = 2000;
- try{
- pdpUpdateInterval = Integer.parseInt(IntegrityMonitorProperties.getProperty(IntegrityMonitorProperties.PDP_UPDATE_INTERVAL));
- }catch(Exception e){
- logger.error
- //System.out.println
- (MessageCodes.EXCEPTION_ERROR, e, "Could not get pdpUpdateInterval property. Using default");
- }
-
- Date now = new Date();
-
- // Retrieve the ms since the epoch
- long nowMs = now.getTime();
-
- // Create the timer which will update the updateDate in DroolsPdpEntity table.
- // This is the heartbeat
- updateWorker = new Timer();
-
- // Schedule the heartbeat to start in 100 ms and run at pdpCheckInterval ms thereafter
- updateWorker.scheduleAtFixedRate(new TimerUpdateClass(), 100, pdpCheckInterval);
- updateWorkerLastRunDate = new Date(nowMs + 100);
-
- // Create the timer which will run the election algorithm
- waitTimer = new Timer();
-
- // Schedule it to start in startMs ms (so it will run after the updateWorker and run at pdpUpdateInterval ms thereafter
- long startMs = getDWaiterStartMs();
- designationWaiter = new DesignationWaiter();
- waitTimer.scheduleAtFixedRate(designationWaiter, startMs, pdpUpdateInterval);
- waitTimerLastRunDate = new Date(nowMs + startMs);
- }
-
- public List<DroolsSessionEntity> waitForDesignation(){
- while(isDesignated == false){
- try {
- Thread.sleep(1000);
- } catch (InterruptedException e) {
- return null;
- }
- }
- return designationWaiter.getSessions();
-
- }
- public List<DroolsSessionEntity> getSessions(){
- return designationWaiter.getSessions();
- }
- public void updateMyPdp(){
- synchronized(pdpsConnectorLock){
- myPdp.setUpdatedDate(new Date());
- pdpsConnector.update(myPdp);
- }
- }
-
- /*
- * When the JpaDroolsPdpsConnector.standDown() method is invoked, it needs
- * access to myPdp, so it can keep its designation status in sync with the
- * DB.
- */
- public static void setMyPdpDesignated(boolean designated) {
- logger.debug
- //System.out.println
- ("setMyPdpDesignated: designated=" + designated);
- myPdp.setDesignated(designated);
- }
-
- private class DesignationWaiter extends TimerTask {
- // get an instance of logger
- private Logger logger = FlexLogger.getLogger(DesignationWaiter.class);
- private List<DroolsSessionEntity> sessions = null;
-
- public List<DroolsSessionEntity> getSessions(){
- if(sessions != null){
- return sessions;
- }
- return new LinkedList<DroolsSessionEntity>();
- }
- public void run() {
- try{
- logger.debug
- //System.out.println
- ("DesignatedWaiter.run: Entering");
-
- // just here initially so code still works
- if (pdpsConnector == null) {
- waitTimerLastRunDate = new Date();
- logger.info("DesignatedWaiter.run (pdpsConnector==null) waitTimerLastRunDate = " + waitTimerLastRunDate);
-
- return;
- }
-
- synchronized (designationWaiterLock) {
-
- logger.debug
- //System.out.println
- ("DesignatedWaiter.run: Entering synchronized block");
-
- checkUpdateWorkerTimer();
-
- //It is possible that multiple PDPs are designated lead. So, we will make a list of all designated
- //PDPs and then decide which one really should be designated at the end.
- ArrayList<DroolsPdp> listOfDesignated = new ArrayList<DroolsPdp>();
-
- Collection<DroolsPdp> pdps = pdpsConnector.getDroolsPdps();
- DroolsPdp designatedPdp = null;
-
- logger.debug
- //System.out.println
- ("DesignatedWaiter.run: pdps.size="
- + pdps.size());
-
- //This is only true if all designated PDPs have failed
- boolean designatedPdpHasFailed = pdpsConnector.hasDesignatedPdpFailed(pdps);
- logger.debug
- //System.out.println
- ("DesignatedWaiter.run: designatedPdpHasFailed="
- + designatedPdpHasFailed);
- for (DroolsPdp pdp : pdps) {
- logger.debug
- //System.out.println
- ("DesignatedWaiter.run: evaluating pdp ID: " + pdp.getPdpId());
-
- /*
- * Note: side effect of isPdpCurrent is that any stale but
- * designated PDPs will be marked as un-designated.
- */
- boolean isCurrent = pdpsConnector.isPdpCurrent(pdp);
-
- /*
- * We can't use stateManagement.getStandbyStatus() here, because
- * we need the standbyStatus, not for this PDP, but for the PDP
- * being processed by this loop iteration.
- */
- String standbyStatus = stateManagement.getStandbyStatus(pdp.getPdpId());
- if(standbyStatus==null){
- // Treat this case as a cold standby -- if we
- // abort here, no sessions will be created in a
- // single-node test environment.
- standbyStatus = StateManagement.COLD_STANDBY;
- }
-
- logger.debug
- //System.out.println
- ("DesignatedWaiter.run: PDP="
- + pdp.getPdpId() + ", isCurrent=" + isCurrent);
-
- /*
- * There are 4 combinations of isDesignated and isCurrent. We will examine each one in-turn
- * and evaluate the each pdp in the list of pdps against each combination.
- *
- * This is the first combination of isDesignated and isCurrent
- */
- if (pdp.isDesignated() && isCurrent) {
- //It is current, but it could have a standbystatus=coldstandby / hotstandby
- //If so, we need to stand it down and demote it
- if(!standbyStatus.equals(StateManagement.PROVIDING_SERVICE)){
- if(pdp.getPdpId().equals(myPdp.getPdpId())){
- logger.debug
- //System.out.println
- ("\n\nDesignatedWaiter.run: myPdp " + myPdp.getPdpId() + " is current and designated, "
- + "butstandbystatus is not providingservice. "
- + " Executing stateManagement.demote()" + "\n\n");
- // So, we must demote it
- try {
- //Keep the order like this. StateManagement is last since it triggers controller shutdown
- //This will change isDesignated and it can enter another if(combination) below
- pdpsConnector.standDownPdp(pdp.getPdpId());
- myPdp.setDesignated(false);
- isDesignated = false;
- if(!(standbyStatus.equals(StateManagement.HOT_STANDBY) ||
- standbyStatus.equals(StateManagement.COLD_STANDBY))){
- /*
- * Only demote it if it appears it has not already been demoted. Don't worry
- * about synching with the topic endpoint states. That is done by the
- * refreshStateAudit
- */
- stateManagement.demote();
- }
- //update the standbystatus to check in a later combination of isDesignated and isCurrent
- standbyStatus=stateManagement.getStandbyStatus(pdp.getPdpId());
- } catch (Exception e) {
- logger.error
- //System.out.println
- ("DesignatedWaiter.run: myPdp: " + myPdp.getPdpId() + " Caught Exception attempting to demote myPdp'"
- + myPdp.getPdpId()
- + "', message="
- + e.getMessage());
- System.out.println(new Date() + " DesignatedWaiter.run: caught unexpected exception "
- + "from stateManagement.demote()");
- e.printStackTrace();
- }
- }else{
- // Don't demote a remote PDP that is current. It should catch itself
- logger.debug
- //System.out.println
- ("\n\nDesignatedWaiter.run: myPdp " + myPdp.getPdpId() + " is current and designated, "
- + "but standbystatus is not providingservice. "
- + " Cannot execute stateManagement.demote() since it it is not myPdp\n\n");
- }
-
- }else{
- // If we get here, it is ok to be on the list
- logger.debug
- //System.out.println
- ("DesignatedWaiter.run: PDP="
- + pdp.getPdpId()
- + " is designated, current and " + standbyStatus +". Noting PDP as designated. standbyStatus=" + standbyStatus);
- listOfDesignated.add(pdp);
- }
-
-
- }
-
-
- /*
- * The second combination of isDesignated and isCurrent
- *
- * PDP is designated but not current; it has failed. So we stand it down (it doesn't matter what
- * its standbyStatus is). None of these go on the list.
- */
- if (pdp.isDesignated() && !isCurrent) {
- logger.info
- //System.out.println
- ("INFO: DesignatedWaiter.run: PDP="
- + pdp.getPdpId()
- + " is currently designated but is not current; it has failed. Standing down. standbyStatus=" + standbyStatus);
-
- /*
- * Changes designated to 0 but it is still potentially providing service
- * Will affect isDesignated, so, it can enter an if(combination) below
- */
- pdpsConnector.standDownPdp(pdp.getPdpId());
-
- //need to change standbystatus to coldstandby
- if (pdp.getPdpId().equals(myPdp.getPdpId())){
- logger.debug
- //System.out.println
- ("\n\nDesignatedWaiter.run: myPdp " + myPdp.getPdpId() + " is not Current. "
- + " Executing stateManagement.disableFailed()" + "\n\n");
- // We found that myPdp is designated but not current
- // So, we must cause it to disableFail
- try {
- myPdp.setDesignated(false);
- //pdpsConnector.setDesignated(myPdp, false);//not needed?
- isDesignated = false;
- stateManagement.disableFailed();
- //stateManagement.demote();
- } catch (Exception e) {
- logger.error
- //System.out.println
- ("DesignatedWaiter.run: myPdp: " + myPdp.getPdpId() + " Caught Exception attempting to disableFail myPdp'"
- + myPdp.getPdpId()
- + "', message="
- + e.getMessage());
- System.out.println(new Date() + " DesignatedWaiter.run: caught unexpected exception "
- + "from stateManagement.disableFailed()");
- e.printStackTrace();
- }
- } else { //it is a remote PDP that is failed
- logger.debug
- //System.out.println
- ("\n\nDesignatedWaiter.run: PDP " + pdp.getPdpId() + " is not Current. "
- + " Executing stateManagement.disableFailed(otherResourceName)" + "\n\n");
- // We found a PDP is designated but not current
- // We already called standdown(pdp) which will change designated to false
- // Now we need to disableFail it to get its states in synch. The standbyStatus
- // should equal coldstandby
- try {
- stateManagement.disableFailed(pdp.getPdpId());
- //stateManagement.demote(pdp.getPdpId());
- } catch (Exception e) {
- logger.error
- //System.out.println
- ("DesignatedWaiter.run: for PDP" + pdp.getPdpId()
- + " Caught Exception attempting to disableFail(" + pdp.getPdpId() + ")'"
- + pdp.getPdpId()
- + "', message="
- + e.getMessage());
- System.out.println(new Date() + " DesignatedWaiter.run: caught unexpected exception "
- + "from stateManagement.disableFailed()");
- e.printStackTrace();
- }
-
- }
- continue; //we are not going to do anything else with this pdp
- }
-
- /*
- * The third combination of isDesignated and isCurrent
- * /*
- * If a PDP is not currently designated but is providing service (erroneous, but recoverable) or hot standby
- * we can add it to the list of possible designated if all the designated have failed
- */
- if (!pdp.isDesignated() && isCurrent){
- if(!(standbyStatus.equals(StateManagement.HOT_STANDBY) ||
- standbyStatus.equals(StateManagement.COLD_STANDBY))){
- logger.info("\n\nDesignatedWaiter.run: PDP " + pdp.getPdpId()
- + " is NOT designated but IS current and"
- + " has a standbystatus=" + standbyStatus);
- // Since it is current, we assume it can adjust its own state.
- // We will demote if it is myPdp
- if(pdp.getPdpId().equals(myPdp.getPdpId())){
- //demote it
- logger.info("DesignatedWaiter.run: PDP " + pdp.getPdpId() + " going to "
- + "setDesignated = false and calling stateManagement.demote");
- try {
- //Keep the order like this. StateManagement is last since it triggers controller shutdown
- pdpsConnector.setDesignated(myPdp, false);
- myPdp.setDesignated(false);
- isDesignated = false;
- //This is definitely not a redundant call. It is attempting to correct a problem
- stateManagement.demote();
- //recheck the standbystatus
- standbyStatus = stateManagement.getStandbyStatus(pdp.getPdpId());
- } catch (Exception e) {
- logger.error
- //System.out.println
- ("DesignatedWaiter.run: myPdp: " + myPdp.getPdpId() + " Caught Exception attempting to demote myPdp'"
- + myPdp.getPdpId()
- + "', message="
- + e.getMessage());
- System.out.println(new Date() + " DesignatedWaiter.run: caught unexpected exception "
- + "from stateManagement.demote()");
- e.printStackTrace();
- }
-
- }
- }
- if(standbyStatus.equals(StateManagement.HOT_STANDBY) && designatedPdpHasFailed){
- //add it to the list
- logger.info
- //System.out.println
- ("INFO: DesignatedWaiter.run: PDP=" + pdp.getPdpId()
- + " is not designated but is " + standbyStatus + " and designated PDP has failed. standbyStatus="
- + standbyStatus);
- logger.info
- //System.out.println
- ("DesignatedWaiter.run: Designating PDP=" + pdp.getPdpId());
- listOfDesignated.add(pdp);
- }
- continue; //done with this one
- }
-
- /*
- * The fourth combination of isDesignated and isCurrent
- *
- * We are not going to put any of these on the list since it appears they have failed.
-
- *
- */
- if(!pdp.isDesignated() && !isCurrent) {
- logger.info
- //System.out.println
- ("INFO: DesignatedWaiter.run: PDP="
- + pdp.getPdpId() + ", designated="
- + pdp.isDesignated() + ", current="
- + isCurrent
- + ", designatedPdpHasFailed="
- + designatedPdpHasFailed
- + ", standbyStatus=" + standbyStatus);
- if(!standbyStatus.equals(StateManagement.COLD_STANDBY)){
- //stand it down
- //disableFail it
- pdpsConnector.standDownPdp(pdp.getPdpId());
- if(pdp.getPdpId().equals(myPdp.getPdpId())){
- /*
- * I don't actually know how this condition could happen, but if it did, we would want
- * to declare it failed.
- */
- logger.debug
- //System.out.println
- ("\n\nDesignatedWaiter.run: myPdp " + myPdp.getPdpId() + " is !current and !designated, "
- + " Executing stateManagement.disableFailed()" + "\n\n");
- // So, we must disableFail it
- try {
- //Keep the order like this. StateManagement is last since it triggers controller shutdown
- myPdp.setDesignated(false);
- isDesignated = false;
- stateManagement.disableFailed();
- //stateManagement.demote();
- } catch (Exception e) {
- logger.error
- //System.out.println
- ("DesignatedWaiter.run: myPdp: " + myPdp.getPdpId() + " Caught Exception attempting to disableFail myPdp'"
- + myPdp.getPdpId()
- + "', message="
- + e.getMessage());
- System.out.println(new Date() + " DesignatedWaiter.run: caught unexpected exception "
- + "from stateManagement.disableFailed()");
- e.printStackTrace();
- }
- }else{//it is remote
- logger.debug
- //System.out.println
- ("\n\nDesignatedWaiter.run: myPdp " + myPdp.getPdpId() + " is !current and !designated, "
- + " Executing stateManagement.disableFailed(" + pdp.getPdpId() + ")" + "\n\n");
- // We already called standdown(pdp) which will change designated to false
- // Now we need to disableFail it to get its states in sync. StandbyStatus = coldstandby
- try {
- stateManagement.disableFailed(pdp.getPdpId());
- //stateManagement.demote(pdp.getPdpId());
- } catch (Exception e) {
- logger.error
- //System.out.println
- ("DesignatedWaiter.run: for PDP" + pdp.getPdpId()
- + " Caught Exception attempting to disableFail(" + pdp.getPdpId() + ")'"
- + pdp.getPdpId()
- + "', message="
- + e.getMessage());
- System.out.println(new Date() + " DesignatedWaiter.run: caught unexpected exception "
- + "from stateManagement.disableFailed()");
- e.printStackTrace();
- }
- }
- }
- }
-
-
- } // end pdps loop
-
- /*
- * We have checked the four combinations of isDesignated and isCurrent. Where appropriate,
- * we added the PDPs to the potential list of designated pdps
- *
- * We need to give priority to pdps on the same site that is currently being used
- * First, however, we must sanitize the list of designated to make sure their are
- * only designated members or non-designated members. There should not be both in
- * the list. Because there are real time delays, it is possible that both types could
- * be on the list.
- */
-
- listOfDesignated = santizeDesignatedList(listOfDesignated);
-
- /*
- * We need to figure out the last pdp that was the primary so we can get the last site
- * name and the last session numbers. We need to create a "dummy" droolspdp since
- * it will be used in later comparrisons and cannot be null.
- */
-
- DroolsPdp mostRecentPrimary = computeMostRecentPrimary(pdps, listOfDesignated);
-
-
- /*
- * It is possible to get here with more than one pdp designated and providingservice. This normally
- * occurs when there is a race condition with multiple nodes coming up at the same time. If that is
- * the case we must determine which one is the one that should be designated and which one should
- * be demoted.
- *
- * It is possible to have 0, 1, 2 or more but not all, or all designated.
- * If we have one designated and current, we chose it and are done
- * If we have 2 or more, but not all, we must determine which one is in the same site as
- * the previously designated pdp.
- */
-
- designatedPdp = computeDesignatedPdp(listOfDesignated, mostRecentPrimary);
-
-
- if (designatedPdp == null) {
- logger.warn
- //System.out.println
- ("WARNING: DesignatedWaiter.run: No viable PDP found to be Designated. designatedPdp still null.");
- // Just to be sure the parameters are correctly set
- myPdp.setDesignated(false);
- pdpsConnector.setDesignated(myPdp,false);
- isDesignated = false;
-
- waitTimerLastRunDate = new Date();
- logger.info("DesignatedWaiter.run (designatedPdp == null) waitTimerLastRunDate = " + waitTimerLastRunDate);
-
- return;
-
- } else if (designatedPdp.getPdpId().equals(myPdp.getPdpId())) {
- logger.debug
- //System.out.println
- ("DesignatedWaiter.run: designatedPdp is PDP=" + myPdp.getPdpId());
- /*
- * update function expects myPdp.isDesignated to be true.
- */
- try {
- //Keep the order like this. StateManagement is last since it triggers controller init
- myPdp.setDesignated(true);
- pdpsConnector.setDesignated(myPdp, true);
- isDesignated = true;
- String standbyStatus = stateManagement.getStandbyStatus();
- if(!standbyStatus.equals(StateManagement.PROVIDING_SERVICE)){
- /*
- * Only call promote if it is not already in the right state. Don't worry about
- * synching the lower level topic endpoint states. That is done by the
- * refreshStateAudit.
- * Note that we need to fetch the session list from 'mostRecentPrimary'
- * at this point -- soon, 'mostRecentPrimary' will be set to this host.
- */
- this.sessions = mostRecentPrimary.getSessions();
- stateManagement.promote();
- }
- } catch (StandbyStatusException e) {
- logger.error
- //System.out.println
- ("ERROR: DesignatedWaiter.run: Caught StandbyStatusException attempting to promote PDP='"
- + myPdp.getPdpId()
- + "', message="
- + e.getMessage());
- myPdp.setDesignated(false);
- pdpsConnector.setDesignated(myPdp,false);
- isDesignated = false;
- //If you can't promote it, demote it
- try {
- String standbyStatus = stateManagement.getStandbyStatus();
- if(!(standbyStatus.equals(StateManagement.HOT_STANDBY) ||
- standbyStatus.equals(StateManagement.COLD_STANDBY))){
- /*
- * Only call demote if it is not already in the right state. Don't worry about
- * synching the lower level topic endpoint states. That is done by the
- * refreshStateAudit.
- */
- stateManagement.demote();
- }
- } catch (Exception e1) {
- logger.error
- //System.out.println
- ("ERROR: DesignatedWaiter.run: Caught StandbyStatusException attempting to promote then demote PDP='"
- + myPdp.getPdpId()
- + "', message="
- + e1.getMessage());
- System.out.println(new Date() + " DesignatedWaiter.run: caught unexpected exception "
- + "from stateManagement.demote()");
- e1.printStackTrace();
- }
-
- } catch (Exception e) {
- logger.error
- //System.out.println
- ("ERROR: DesignatedWaiter.run: Caught Exception attempting to promote PDP='"
- + myPdp.getPdpId()
- + "', message="
- + e.getMessage());
- myPdp.setDesignated(false);
- pdpsConnector.setDesignated(myPdp,false);
- isDesignated = false;
- //If you can't promote it, demote it
- try {
- String standbyStatus = stateManagement.getStandbyStatus();
- if(!(standbyStatus.equals(StateManagement.HOT_STANDBY) ||
- standbyStatus.equals(StateManagement.COLD_STANDBY))){
- /*
- * Only call demote if it is not already in the right state. Don't worry about
- * synching the lower level topic endpoint states. That is done by the
- * refreshStateAudit.
- */
- stateManagement.demote();
- }
- } catch (Exception e1) {
- logger.error
- //System.out.println
- ("ERROR: DesignatedWaiter.run: Caught StandbyStatusException attempting to promote then demote PDP='"
- + myPdp.getPdpId()
- + "', message="
- + e1.getMessage());
- System.out.println(new Date() + " DesignatedWaiter.run: caught unexpected exception "
- + "from stateManagement.demote()");
- e1.printStackTrace();
- }
-
- }
- waitTimerLastRunDate = new Date();
- logger.info("DesignatedWaiter.run (designatedPdp.getPdpId().equals(myPdp.getPdpId())) waitTimerLastRunDate = " + waitTimerLastRunDate);
-
- return;
- }
- isDesignated = false;
-
- } // end synchronized
-
- logger.debug
- //System.out.println
- ("DesignatedWaiter.run: myPdp: " + myPdp.getPdpId() + "; Returning, isDesignated=" + isDesignated);
-
- Date tmpDate = new Date();
- logger.info("DesignatedWaiter.run (end of run) waitTimerLastRunDate = " + tmpDate);
-
- waitTimerLastRunDate = tmpDate;
-
- }catch(Exception e){
- logger.error("DesignatedWaiter.run caught an unexpected exception: " + e);
- System.out.println(new Date() + " DesignatedWaiter.run: caught unexpected exception");
- e.printStackTrace();
- }
- } // end run
- }
-
- public ArrayList<DroolsPdp> santizeDesignatedList(ArrayList<DroolsPdp> listOfDesignated){
-
- boolean containsDesignated = false;
- boolean containsHotStandby = false;
- ArrayList<DroolsPdp> listForRemoval = new ArrayList<DroolsPdp>();
- for(DroolsPdp pdp : listOfDesignated){
- logger.debug
- //System.out.println
- ("DesignatedWaiter.run sanitizing: pdp = " + pdp.getPdpId()
- + " isDesignated = " + pdp.isDesignated());
- if(pdp.isDesignated()){
- containsDesignated = true;
- }else {
- containsHotStandby = true;
- listForRemoval.add(pdp);
- }
- }
- if(containsDesignated && containsHotStandby){
- //remove the hot standby from the list
- listOfDesignated.removeAll(listForRemoval);
- containsHotStandby = false;
- }
- return listOfDesignated;
- }
-
- public DroolsPdp computeMostRecentPrimary(Collection<DroolsPdp> pdps, ArrayList<DroolsPdp> listOfDesignated){
- boolean containsDesignated = false;
- for(DroolsPdp pdp : listOfDesignated){
- if(pdp.isDesignated()){
- containsDesignated = true;
- }
- }
- DroolsPdp mostRecentPrimary = new DroolsPdpImpl(null, true, 1, new Date(0));
- mostRecentPrimary.setSiteName(null);
- logger.debug
- //System.out.println
- ("DesignatedWaiter.run listOfDesignated.size() = " + listOfDesignated.size());
- if(listOfDesignated.size() <=1){
- logger.debug("DesignatedWainter.run: listOfDesignated.size <=1");
- //Only one or none is designated or hot standby. Choose the latest designated date
- for(DroolsPdp pdp : pdps){
- logger.debug
- //System.out.println
- ("DesignatedWaiter.run pdp = " + pdp.getPdpId()
- + " pdp.getDesignatedDate() = " + pdp.getDesignatedDate());
- if(pdp.getDesignatedDate().compareTo(mostRecentPrimary.getDesignatedDate()) > 0){
- mostRecentPrimary = pdp;
- logger.debug
- //System.out.println
- ("DesignatedWaiter.run mostRecentPrimary = " + mostRecentPrimary.getPdpId());
- }
- }
- }else if(listOfDesignated.size() == pdps.size()){
- logger.debug("DesignatedWainter.run: listOfDesignated.size = pdps.size() which is " + pdps.size());
- //They are all designated or all hot standby.
- mostRecentPrimary = null;
- for(DroolsPdp pdp : pdps){
- if(mostRecentPrimary == null){
- mostRecentPrimary = pdp;
- continue;
- }
- if(containsDesignated){ //Choose the site of the first designated date
- if(pdp.getDesignatedDate().compareTo(mostRecentPrimary.getDesignatedDate()) < 0){
- mostRecentPrimary = pdp;
- logger.debug
- //System.out.println
- ("DesignatedWaiter.run mostRecentPrimary = " + mostRecentPrimary.getPdpId());
- }
- }else{ //Choose the site with the latest designated date
- if(pdp.getDesignatedDate().compareTo(mostRecentPrimary.getDesignatedDate()) > 0){
- mostRecentPrimary = pdp;
- logger.debug
- //System.out.println
- ("DesignatedWaiter.run mostRecentPrimary = " + mostRecentPrimary.getPdpId());
- }
- }
- }
- }else{
- logger.debug("DesignatedWainter.run: Some but not all are designated or hot standby. ");
- //Some but not all are designated or hot standby.
- if(containsDesignated){
- logger.debug("DesignatedWainter.run: containsDesignated = " + containsDesignated);
- /*
- * The list only contains designated. This is a problem. It is most likely a race
- * condition that resulted in two thinking they should be designated. Choose the
- * site with the latest designated date for the pdp not included on the designated list.
- * This should be the site that had the last designation before this race condition
- * occurred.
- */
- for(DroolsPdp pdp : pdps){
- if(listOfDesignated.contains(pdp)){
- continue; //Don't consider this entry
- }
- if(pdp.getDesignatedDate().compareTo(mostRecentPrimary.getDesignatedDate()) > 0){
- mostRecentPrimary = pdp;
- logger.debug
- //System.out.println
- ("DesignatedWaiter.run mostRecentPrimary = " + mostRecentPrimary.getPdpId());
- }
- }
- }else{
- logger.debug("DesignatedWainter.run: containsDesignated = " + containsDesignated);
- //The list only contains hot standby. Choose the site of the latest designated date
- for(DroolsPdp pdp : pdps){
- if(pdp.getDesignatedDate().compareTo(mostRecentPrimary.getDesignatedDate()) > 0){
- mostRecentPrimary = pdp;
- logger.debug
- //System.out.println
- ("DesignatedWaiter.run mostRecentPrimary = " + mostRecentPrimary.getPdpId());
- }
- }
- }
- }
- return mostRecentPrimary;
- }
-
- public DroolsPdp computeDesignatedPdp(ArrayList<DroolsPdp> listOfDesignated, DroolsPdp mostRecentPrimary){
- DroolsPdp designatedPdp = null;
- DroolsPdp lowestPriorityPdp = null;
- if(listOfDesignated.size() > 1){
- logger.debug
- //System.out.println
- ("DesignatedWaiter.run: myPdp: " + myPdp.getPdpId() + " listOfDesignated.size(): " + listOfDesignated.size());
- DroolsPdp rejectedPdp = null;
- DroolsPdp lowestPrioritySameSite = null;
- DroolsPdp lowestPriorityDifferentSite = null;
- for(DroolsPdp pdp : listOfDesignated){
- // We need to determine if another PDP is the lowest priority
- if(nullSafeEquals(pdp.getSiteName(),mostRecentPrimary.getSiteName())){
- if(lowestPrioritySameSite == null){
- if(lowestPriorityDifferentSite != null){
- rejectedPdp = lowestPriorityDifferentSite;
- }
- lowestPrioritySameSite = pdp;
- }else{
- if(pdp.getPdpId().equals((lowestPrioritySameSite.getPdpId()))){
- continue;//nothing to compare
- }
- if(pdp.comparePriority(lowestPrioritySameSite) <0){
- logger.debug
- //System.out.println
- ("\nDesignatedWaiter.run: myPdp" + myPdp.getPdpId() + " listOfDesignated pdp ID: " + pdp.getPdpId()
- + " has lower priority than pdp ID: " + lowestPrioritySameSite.getPdpId());
-
- //we need to reject lowestPrioritySameSite
- rejectedPdp = lowestPrioritySameSite;
- lowestPrioritySameSite = pdp;
- } else{
- //we need to reject pdp and keep lowestPrioritySameSite
- logger.debug
- //System.out.println
- ("\nDesignatedWaiter.run: myPdp" + myPdp.getPdpId() + " listOfDesignated pdp ID: " + pdp.getPdpId()
- + " has higher priority than pdp ID: " + lowestPrioritySameSite.getPdpId());
- rejectedPdp = pdp;
- }
- }
- } else{
- if(lowestPrioritySameSite != null){
- //if we already have a candidate for same site, we don't want to bother with different sites
- rejectedPdp = pdp;
- } else{
- if(lowestPriorityDifferentSite == null){
- lowestPriorityDifferentSite = pdp;
- continue;
- }
- if(pdp.getPdpId().equals((lowestPriorityDifferentSite.getPdpId()))){
- continue;//nothing to compare
- }
- if(pdp.comparePriority(lowestPriorityDifferentSite) <0){
- logger.debug
- //System.out.println
- ("\nDesignatedWaiter.run: myPdp" + myPdp.getPdpId() + " listOfDesignated pdp ID: " + pdp.getPdpId()
- + " has lower priority than pdp ID: " + lowestPriorityDifferentSite.getPdpId());
-
- //we need to reject lowestPriorityDifferentSite
- rejectedPdp = lowestPriorityDifferentSite;
- lowestPriorityDifferentSite = pdp;
- } else{
- //we need to reject pdp and keep lowestPriorityDifferentSite
- logger.debug
- //System.out.println
- ("\nDesignatedWaiter.run: myPdp" + myPdp.getPdpId() + " listOfDesignated pdp ID: " + pdp.getPdpId()
- + " has higher priority than pdp ID: " + lowestPriorityDifferentSite.getPdpId());
- rejectedPdp = pdp;
- }
- }
- }
- // If the rejectedPdp is myPdp, we need to stand it down and demote it. Each pdp is responsible
- // for demoting itself
- if(rejectedPdp != null && nullSafeEquals(rejectedPdp.getPdpId(),myPdp.getPdpId())){
- logger.debug
- //System.out.println
- ("\n\nDesignatedWaiter.run: myPdp: " + myPdp.getPdpId() + " listOfDesignated myPdp ID: " + myPdp.getPdpId()
- + " is NOT the lowest priority. Executing stateManagement.demote()" + "\n\n");
- // We found that myPdp is on the listOfDesignated and it is not the lowest priority
- // So, we must demote it
- try {
- //Keep the order like this. StateManagement is last since it triggers controller shutdown
- myPdp.setDesignated(false);
- pdpsConnector.setDesignated(myPdp, false);
- isDesignated = false;
- String standbyStatus = stateManagement.getStandbyStatus();
- if(!(standbyStatus.equals(StateManagement.HOT_STANDBY) ||
- standbyStatus.equals(StateManagement.COLD_STANDBY))){
- /*
- * Only call demote if it is not already in the right state. Don't worry about
- * synching the lower level topic endpoint states. That is done by the
- * refreshStateAudit.
- */
- stateManagement.demote();
- }
- } catch (Exception e) {
- myPdp.setDesignated(false);
- pdpsConnector.setDesignated(myPdp, false);
- isDesignated = false;
- logger.error
- //System.out.println
- ("DesignatedWaiter.run: myPdp: " + myPdp.getPdpId() + " Caught Exception attempting to demote myPdp'"
- + myPdp.getPdpId()
- + "', message="
- + e.getMessage());
- System.out.println(new Date() + " DesignatedWaiter.run: caught unexpected exception "
- + "from stateManagement.demote()");
- e.printStackTrace();
- }
- }
- } //end: for(DroolsPdp pdp : listOfDesignated)
- if(lowestPrioritySameSite != null){
- lowestPriorityPdp = lowestPrioritySameSite;
- } else {
- lowestPriorityPdp = lowestPriorityDifferentSite;
- }
- //now we have a valid value for lowestPriorityPdp
- logger.debug
- //System.out.println
- ("\n\nDesignatedWaiter.run: myPdp: " + myPdp.getPdpId() + " listOfDesignated found the LOWEST priority pdp ID: "
- + lowestPriorityPdp.getPdpId()
- + " It is now the designatedPpd from the perspective of myPdp ID: " + myPdp + "\n\n");
- designatedPdp = lowestPriorityPdp;
-
- } else if(listOfDesignated.isEmpty()){
- logger.debug
- //System.out.println
- ("\nDesignatedWaiter.run: myPdp: " + myPdp.getPdpId() + " listOfDesignated is: EMPTY.");
- designatedPdp = null;
- } else{ //only one in listOfDesignated
- logger.debug
- //System.out.println
- ("\nDesignatedWaiter.run: myPdp: " + myPdp.getPdpId() + " listOfDesignated has ONE entry. PDP ID: "
- + listOfDesignated.get(0).getPdpId());
- designatedPdp = listOfDesignated.get(0);
- }
- return designatedPdp;
-
- }
-
- private class TimerUpdateClass extends TimerTask{
-
- @Override
- public void run() {
- try{
- logger.info("TimerUpdateClass.run: entry");
- checkWaitTimer();
- synchronized(pdpsConnectorLock){
-
- myPdp.setUpdatedDate(new Date());
- if(myPdp.isDesignated()){
- myPdp.setDesignatedDate(new Date());
- }
- pdpsConnector.update(myPdp);
-
- Date tmpDate = new Date();
- logger.info("TimerUpdateClass.run: updateWorkerLastRunDate = " + tmpDate);
-
- updateWorkerLastRunDate = tmpDate;
- }
- logger.info("TimerUpdateClass.run.exit");
- }catch(Exception e){
- logger.error("TimerUpdateClass.run caught an unexpected exception: " + e);
- System.out.println(new Date() + " TimerUpdateClass.run caught an unexpected exception");
- e.printStackTrace();
- }
- }
- }
- @Override
- public void checkThreadStatus() {
- checkUpdateWorkerTimer();
- checkWaitTimer();
- }
-
- private void checkUpdateWorkerTimer(){
- synchronized(checkUpdateWorkerLock){
- try{
- logger.debug("checkUpdateWorkerTimer: entry");
- Date now = new Date();
- long nowMs = now.getTime();
- long updateWorkerMs = updateWorkerLastRunDate.getTime();
- //give it 2 second cushion
- if((nowMs - updateWorkerMs) > pdpCheckInterval + 2000){
- logger.error("checkUpdateWorkerTimer: nowMs - updateWorkerMs = " + (nowMs - updateWorkerMs)
- + ", exceeds pdpCheckInterval + 2000 = " + (pdpCheckInterval + 2000) + " Will reschedule updateWorker timer");
-
- try{
- updateWorker.cancel();
- // Recalculate the time because this is a synchronized section and the thread could have
- // been blocked.
- now = new Date();
- nowMs = now.getTime();
- updateWorker = new Timer();
- // reset the updateWorkerLastRunDate
- updateWorkerLastRunDate = new Date(nowMs + 100);
- //execute the first time in 100 ms
- updateWorker.scheduleAtFixedRate(new TimerUpdateClass(), 100, pdpCheckInterval);
- logger.info("checkUpdateWorkerTimer: Scheduling updateWorker timer to start in 100 ms ");
- }catch(Exception e){
- logger.error("checkUpdateWorkerTimer: Caught unexpected Exception: " + e);
- System.out.println(new Date() + " checkUpdateWorkerTimer caught an unexpected exception");
- e.printStackTrace();
- // Recalculate the time because this is a synchronized section and the thread could have
- // been blocked.
- now = new Date();
- nowMs = now.getTime();
- updateWorker = new Timer();
- updateWorkerLastRunDate = new Date(nowMs + 100);
- updateWorker.scheduleAtFixedRate(new TimerUpdateClass(), 100, pdpCheckInterval);
- logger.info("checkUpdateWorkerTimer: Attempting to schedule updateWorker timer in 100 ms");
- }
-
- }
- logger.debug("checkUpdateWorkerTimer: exit");
- }catch(Exception e){
- logger.error("checkUpdateWorkerTimer: caught unexpected exception: " + e);
- System.out.println(new Date() + " checkUpdateWorkerTimer - top level - caught an unexpected exception");
- e.printStackTrace();
- }
- }
- }
-
- private void checkWaitTimer(){
- synchronized(checkWaitTimerLock){
- try{
- logger.debug("checkWaitTimer: entry");
- Date now = new Date();
- long nowMs = now.getTime();
- long waitTimerMs = waitTimerLastRunDate.getTime();
-
- //give it 2 times leeway
- if((nowMs - waitTimerMs) > 2*pdpUpdateInterval){
- logger.error("checkWaitTimer: nowMs - waitTimerMs = " + (nowMs - waitTimerMs)
- + ", exceeds pdpUpdateInterval + 2000 = " + (2*pdpUpdateInterval) + " Will reschedule waitTimer timer");
-
-
- try{
- // Recalculate since the thread could have been stalled on the synchronize()
- nowMs = (new Date()).getTime();
- // Time to the start of the next pdpUpdateInterval multiple
- long startMs = getDWaiterStartMs();
- waitTimer.cancel();
- designationWaiter = new DesignationWaiter();
- waitTimer = new Timer();
- waitTimerLastRunDate = new Date(nowMs + startMs);
- waitTimer.scheduleAtFixedRate(designationWaiter, startMs, pdpUpdateInterval);
- logger.info("checkWaitTimer: Scheduling waitTimer timer to start in " + startMs + " ms");
- }catch(Exception e){
- logger.error("checkWaitTimer: Caught unexpected Exception: " + e);
- System.out.println(new Date() + " checkWaitTimer caught an unexpected exception");
- e.printStackTrace();
- // Recalculate since the thread could have been stalled on the synchronize()
- nowMs = (new Date()).getTime();
- // Time to the start of the next pdpUpdateInterval multiple
- long startMs = getDWaiterStartMs();
- designationWaiter = new DesignationWaiter();
- waitTimer = new Timer();
- waitTimerLastRunDate = new Date(nowMs + startMs);
- waitTimer.scheduleAtFixedRate(designationWaiter, startMs, pdpUpdateInterval);
- logger.info("checkWaitTimer: Scheduling waitTimer timer in " + startMs + " ms");
- }
-
- }
- logger.debug("checkWaitTimer: exit");
- }catch(Exception e){
- logger.error("checkWaitTimer: caught unexpected exception: " + e);
- System.out.println(new Date() + " checkWaitTimer caught an unexpected exception");
- e.printStackTrace();
- }
- }
- }
-
- private long getDWaiterStartMs(){
- Date now = new Date();
-
- // Retrieve the ms since the epoch
- long nowMs = now.getTime();
-
- // Time since the end of the last pdpUpdateInterval multiple
- long nowModMs = nowMs % pdpUpdateInterval;
-
- // Time to the start of the next pdpUpdateInterval multiple
- long startMs = 2*pdpUpdateInterval - nowModMs;
-
- // Give the start time a minimum of a 5 second cushion
- if(startMs < 5000){
- // Start at the beginning of following interval
- startMs = pdpUpdateInterval + startMs;
- }
- return startMs;
- }
-
- private boolean nullSafeEquals(Object one, Object two){
- if(one == null && two == null){
- return true;
- }
- if(one != null && two != null){
- return one.equals(two);
- }
- return false;
- }
-}
diff --git a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsPersistenceProperties.java b/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsPersistenceProperties.java
deleted file mode 100644
index 63af53c..0000000
--- a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsPersistenceProperties.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.policy.drools.persistence;
-
-import java.util.Properties;
-
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-
-public class DroolsPersistenceProperties {
- // get an instance of logger
- private static Logger logger = FlexLogger.getLogger(DroolsPersistenceProperties.class);
- /*
- * droolsPersistence.properties parameter key values
- */
- public static final String DB_DRIVER = "javax.persistence.jdbc.driver";
- public static final String DB_DATA_SOURCE = "hibernate.dataSource";
- public static final String DB_URL = "javax.persistence.jdbc.url";
- public static final String DB_USER = "javax.persistence.jdbc.user";
- public static final String DB_PWD = "javax.persistence.jdbc.password";
-
- private static Properties properties = null;
- /*
- * Initialize the parameter values from the droolsPersitence.properties file values
- *
- * This is designed so that the Properties object is obtained from the droolsPersistence.properties
- * file and then is passed to this method to initialize the value of the parameters.
- * This allows the flexibility of JUnit tests using getProperties(filename) to get the
- * properties while runtime methods can use getPropertiesFromClassPath(filename).
- *
- */
- public static void initProperties (Properties prop){
- logger.info("DroolsPersistenceProperties.initProperties(Properties): entry");
- logger.info("\n\nDroolsPersistenceProperties.initProperties: Properties = \n" + prop + "\n\n");
-
- properties = prop;
- }
-
- public static String getProperty(String key){
- return properties.getProperty(key);
- }
-
- public static Properties getProperties() {
- return properties;
- }
-}
diff --git a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsSession.java b/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsSession.java
deleted file mode 100644
index 21a480d..0000000
--- a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsSession.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.policy.drools.persistence;
-
-public interface DroolsSession {
-
- public String getPdpId();
- public void setPdpId(String pdpId);
- public String getSessionName();
- public void setSessionName(String sessionName);
- public long getSessionId();
- public void setSessionId(long sessionId);
-}
diff --git a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsSessionEntity.java b/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsSessionEntity.java
deleted file mode 100644
index 247f9c8..0000000
--- a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/DroolsSessionEntity.java
+++ /dev/null
@@ -1,93 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.policy.drools.persistence;
-
-import java.io.Serializable;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.ManyToOne;
-@Entity
-public class DroolsSessionEntity implements Serializable, DroolsSession {
-
- private static final long serialVersionUID = -5495057038819948709L;
-
- @Id
- @Column(name="pdpId", nullable=false)
- private String pdpId="-1";
- @Id
- @Column(name="sessionName", nullable=false)
- private String sessionName="-1";
-
- @Column(name="sessionId", nullable=false)
- private long sessionId=-1L;
-
- @ManyToOne
- private DroolsPdpEntity pdpEntity;
- public DroolsSessionEntity(){
-
- }
- @Override
- public String getPdpId() {
- return pdpId;
- }
- @Override
- public void setPdpId(String pdpId) {
- this.pdpId = pdpId;
- }
- @Override
- public String getSessionName() {
- return sessionName;
- }
- @Override
- public void setSessionName(String sessionName) {
- this.sessionName = sessionName;
- }
- @Override
- public long getSessionId() {
- return sessionId;
- }
-
- @Override
- public void setSessionId(long sessionId) {
- this.sessionId = sessionId;
- }
- public void setPdpEntity(DroolsPdpEntity pdpEntity){
- this.pdpEntity = pdpEntity;
- }
- @Override
- public boolean equals(Object other){
- if(other instanceof DroolsSession){
- return this.getPdpId().equals(((DroolsSession)other).getPdpId()) && this.getSessionName().equals(((DroolsSession)other).getSessionName());
- }else{
- return false;
- }
- }
-
- @Override
- public int hashCode(){
- String combinedId = this.getPdpId().concat(":").concat(this.getSessionName());
- return combinedId.hashCode();
- }
-
-
-}
diff --git a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/JpaDroolsPdpsConnector.java b/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/JpaDroolsPdpsConnector.java
deleted file mode 100644
index d203289..0000000
--- a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/JpaDroolsPdpsConnector.java
+++ /dev/null
@@ -1,689 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.policy.drools.persistence;
-
-import java.util.Collection;
-import java.util.Date;
-import java.util.LinkedList;
-import java.util.List;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.FlushModeType;
-import javax.persistence.LockModeType;
-import javax.persistence.Query;
-
-import org.openecomp.policy.drools.core.IntegrityMonitorProperties;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-
-
-public class JpaDroolsPdpsConnector implements DroolsPdpsConnector {
-
- // get an instance of logger
- private static Logger logger = FlexLogger.getLogger(JpaDroolsPdpsConnector.class);
- private EntityManagerFactory emf;
-
-
- //not sure if we want to use the same entity manager factory for drools session and pass it in here, or create a new one
- public JpaDroolsPdpsConnector(EntityManagerFactory emf){
- this.emf = emf;
- }
- @Override
- public Collection<DroolsPdp> getDroolsPdps() {
- //return a list of all the DroolsPdps in the database
- EntityManager em = emf.createEntityManager();
- try {
- em.getTransaction().begin();
- Query droolsPdpsListQuery = em.createQuery("SELECT p FROM DroolsPdpEntity p");
- List<?> droolsPdpsList = droolsPdpsListQuery.setLockMode(LockModeType.NONE).setFlushMode(FlushModeType.COMMIT).getResultList();
- LinkedList<DroolsPdp> droolsPdpsReturnList = new LinkedList<DroolsPdp>();
- for(Object o : droolsPdpsList){
- if(o instanceof DroolsPdp){
- //Make sure it is not a cached version
- em.refresh((DroolsPdpEntity)o);
- droolsPdpsReturnList.add((DroolsPdp)o);
- if (logger.isDebugEnabled()) {
- DroolsPdp droolsPdp = (DroolsPdp)o;
- logger.debug("getDroolsPdps: PDP=" + droolsPdp.getPdpId()
- + ", isDesignated=" + droolsPdp.isDesignated()
- + ", updatedDate=" + droolsPdp.getUpdatedDate()
- + ", priority=" + droolsPdp.getPriority());
- }
- }
- }
- try{
- em.getTransaction().commit();
- }catch(Exception e){
- logger.error
- (MessageCodes.EXCEPTION_ERROR, e,"Cannot commit getDroolsPdps() transaction");
- }
- return droolsPdpsReturnList;
- } finally {
- cleanup(em, "getDroolsPdps");
- }
- }
-
- private boolean nullSafeEquals(Object one, Object two){
- if(one == null && two == null){
- return true;
- }
- if(one != null && two != null){
- return one.equals(two);
- }
- return false;
- }
-
- @Override
- public void update(DroolsPdp pdp) {
-
- if (logger.isDebugEnabled()) {
- logger.debug("update: Entering, pdpId=" + pdp.getPdpId());
- }
-
- //this is to update our own pdp in the database
- EntityManager em = emf.createEntityManager();
- try {
- em.getTransaction().begin();
- Query droolsPdpsListQuery = em.createQuery("SELECT p FROM DroolsPdpEntity p WHERE p.pdpId=:pdpId");
- droolsPdpsListQuery.setParameter("pdpId", pdp.getPdpId());
- List<?> droolsPdpsList = droolsPdpsListQuery.setLockMode(LockModeType.NONE).setFlushMode(FlushModeType.COMMIT).getResultList();
- //em.getTransaction().begin();
- DroolsPdpEntity droolsPdpEntity;
- if(droolsPdpsList.size() == 1 && (droolsPdpsList.get(0) instanceof DroolsPdpEntity)){
- droolsPdpEntity = (DroolsPdpEntity)droolsPdpsList.get(0);
- //if(pdp.getSessionId() < 0){
- //if its less than 0, then we know it is not a real session number so we want to save the one that the database has for us, to avoid information loss
- //pdp.setSessionId(droolsPdpEntity.getSessionId());
- //}
- Date currentDate = new Date();
- long difference = currentDate.getTime()-droolsPdpEntity.getUpdatedDate().getTime();
- //just set some kind of default here
- long pdpTimeout = 15000;
- try{
- pdpTimeout = Long.parseLong(IntegrityMonitorProperties.getProperty(IntegrityMonitorProperties.PDP_TIMEOUT));
- }catch(Exception e){
- logger.error
- (MessageCodes.EXCEPTION_ERROR, e,"Could not get PDP timeout property, using default.");
- }
- boolean isCurrent = difference<pdpTimeout;
- if (logger.isDebugEnabled()) {
- logger.debug("update: PDP=" + pdp.getPdpId() + ", isCurrent="
- + isCurrent + ", difference=" + difference
- + ", pdpTimeout=" + pdpTimeout + ", designated="
- + droolsPdpEntity.isDesignated());
- }
- } else {
- if (logger.isDebugEnabled()) {
- logger.debug("update: For PDP=" + pdp.getPdpId()
- + ", instantiating new DroolsPdpEntity");
- }
- droolsPdpEntity = new DroolsPdpEntity();
- em.persist(droolsPdpEntity);
- droolsPdpEntity.setPdpId(pdp.getPdpId());
- }
- if(droolsPdpEntity.getPriority() != pdp.getPriority()){
- droolsPdpEntity.setPriority(pdp.getPriority());
- }
- if(!droolsPdpEntity.getUpdatedDate().equals(pdp.getUpdatedDate())){
- droolsPdpEntity.setUpdatedDate(pdp.getUpdatedDate());
- }
- if(!droolsPdpEntity.getDesignatedDate().equals(pdp.getDesignatedDate())){
- droolsPdpEntity.setDesignatedDate(pdp.getDesignatedDate());
- }
- if(!nullSafeEquals(droolsPdpEntity.getSiteName(),pdp.getSiteName())){
- droolsPdpEntity.setSiteName(pdp.getSiteName());
- }
- List<DroolsSessionEntity> sessionsToAdd = new LinkedList<DroolsSessionEntity>();
- for(DroolsSessionEntity localSession : pdp.getSessions()){
- boolean found = false;
- for(DroolsSessionEntity dbSession : droolsPdpEntity.getSessions()){
- if(localSession.equals(dbSession)){
- found = true;
- dbSession.setSessionId(localSession.getSessionId());
- }
- }
- if(!found){
- sessionsToAdd.add(localSession);
- }
-
- }
- for(DroolsSessionEntity sessionToAdd : sessionsToAdd){
- em.persist(sessionToAdd);
- droolsPdpEntity.getSessions().add(sessionToAdd);
- }
-
-
- if(droolsPdpEntity.isDesignated() != pdp.isDesignated()){
- if (logger.isDebugEnabled()) {
- logger.debug("update: pdpId=" + pdp.getPdpId()
- + ", pdp.isDesignated=" + pdp.isDesignated()
- + ", droolsPdpEntity.pdpId="
- + droolsPdpEntity.getPdpId()
- + ", droolsPdpEntity.isDesignated="
- + droolsPdpEntity.isDesignated());
- }
- droolsPdpEntity.setDesignated(pdp.isDesignated());
- }
- em.getTransaction().commit();
- } finally {
- cleanup(em, "update");
- }
-
- if (logger.isDebugEnabled()) {
- logger.debug("update: Exiting");
- }
-
- }
-
- /*
- * Note: A side effect of this boolean method is that if the PDP is designated but not current, the
- * droolspdpentity.DESIGNATED column will be set to false (the PDP will be un-designated, i.e. marked as
- * being in standby mode)
- */
- @Override
- public boolean isPdpCurrent(DroolsPdp pdp) {
-
- boolean isCurrent = isCurrent(pdp);
-
- EntityManager em = emf.createEntityManager();
- try{
- if(!isCurrent && pdp.isDesignated()){
- em.getTransaction().begin();
- Query droolsPdpsListQuery = em.createQuery("SELECT p FROM DroolsPdpEntity p WHERE p.pdpId=:pdpId");
- droolsPdpsListQuery.setParameter("pdpId", pdp.getPdpId());
- List<?> droolsPdpsList = droolsPdpsListQuery.setLockMode(LockModeType.NONE).setFlushMode(FlushModeType.COMMIT).getResultList();
- if(droolsPdpsList.size() == 1 && droolsPdpsList.get(0) instanceof DroolsPdpEntity){
- if (logger.isDebugEnabled()) {
- logger.debug("isPdpCurrent: PDP=" + pdp.getPdpId() + " designated but not current; setting designated to false");
- }
- DroolsPdpEntity droolsPdpEntity = (DroolsPdpEntity)droolsPdpsList.get(0);
- droolsPdpEntity.setDesignated(false);
- em.getTransaction().commit();
- } else {
- logger.warn("isPdpCurrent: PDP=" + pdp.getPdpId() + " is designated but not current; however it does not have a DB entry, so cannot set DESIGNATED to false!");
- }
- } else {
- if (logger.isDebugEnabled()) {
- logger.debug("isPdpCurrent: For PDP=" + pdp.getPdpId()
- + ", designated="
- + pdp.isDesignated() + ", isCurrent=" + isCurrent);
- }
- }
- }catch(Exception e){
- logger.error
- (MessageCodes.EXCEPTION_ERROR, e,"Could not update expired record marked as designated in the database");
- } finally {
- cleanup(em, "isPdpCurrent");
- }
- return isCurrent;
-
- }
-
- @Override
- public void setDesignated(DroolsPdp pdp, boolean designated) {
-
- if (logger.isDebugEnabled()) {
- logger.debug("setDesignated: Entering, pdpId='" + pdp.getPdpId()
- + "', designated=" + designated);
- }
-
- EntityManager em = null;
- try {
- em = emf.createEntityManager();
- em.getTransaction().begin();
- Query droolsPdpsListQuery = em
- .createQuery("SELECT p FROM DroolsPdpEntity p WHERE p.pdpId=:pdpId");
- droolsPdpsListQuery.setParameter("pdpId", pdp.getPdpId());
- List<?> droolsPdpsList = droolsPdpsListQuery.setLockMode(
- LockModeType.NONE).setFlushMode(FlushModeType.COMMIT).getResultList();
- if (droolsPdpsList.size() == 1
- && droolsPdpsList.get(0) instanceof DroolsPdpEntity) {
- DroolsPdpEntity droolsPdpEntity = (DroolsPdpEntity) droolsPdpsList
- .get(0);
- if (logger.isDebugEnabled()) {
- logger.debug("setDesignated: PDP=" + pdp.getPdpId()
- + " found, designated="
- + droolsPdpEntity.isDesignated() + ", setting to "
- + designated);
- }
- droolsPdpEntity.setDesignated(designated);
- em.getTransaction().commit();
- } else {
- logger.error("setDesignated: PDP=" + pdp.getPdpId()
- + " not in DB; cannot update designation");
- }
- } catch (Exception e) {
- logger.error("setDesignated: Caught Exception, message='"
- + e.getMessage() + "'");
- } finally {
- cleanup(em, "setDesignated");
- }
-
- if (logger.isDebugEnabled()) {
- logger.debug("setDesignated: Exiting");
- }
-
- }
-
-
- @Override
- public void standDownPdp(String pdpId) {
-
- logger.info("standDownPdp: Entering, pdpId='" + pdpId + "'");
-
- EntityManager em = null;
- try {
- /*
- * Start transaction.
- */
- em = emf.createEntityManager();
- em.getTransaction().begin();
-
- /*
- * Get droolspdpentity record for this PDP and mark DESIGNATED as
- * false.
- */
- Query droolsPdpsListQuery = em
- .createQuery("SELECT p FROM DroolsPdpEntity p WHERE p.pdpId=:pdpId");
- droolsPdpsListQuery.setParameter("pdpId", pdpId);
- List<?> droolsPdpsList = droolsPdpsListQuery.setLockMode(
- LockModeType.NONE).setFlushMode(FlushModeType.COMMIT).getResultList();
- DroolsPdpEntity droolsPdpEntity;
- if (droolsPdpsList.size() == 1
- && (droolsPdpsList.get(0) instanceof DroolsPdpEntity)) {
- droolsPdpEntity = (DroolsPdpEntity) droolsPdpsList.get(0);
- droolsPdpEntity.setDesignated(false);
- em.persist(droolsPdpEntity);
- logger.info("standDownPdp: PDP=" + pdpId + " persisted as non-designated.");
- } else {
- logger.error("standDownPdp: Missing record in droolspdpentity for pdpId="
- + pdpId + "; cannot stand down PDP");
- }
-
- /*
- * End transaction.
- */
- em.getTransaction().commit();
- cleanup(em, "standDownPdp");
- em = null;
-
- // Keep the election handler in sync with the DB
- DroolsPdpsElectionHandler.setMyPdpDesignated(false);
-
- } catch (Exception e) {
- logger.error("standDownPdp: Unexpected Exception attempting to mark DESIGNATED as false for droolspdpentity, pdpId="
- + pdpId
- + ". Cannot stand down PDP; message="
- + e.getMessage());
- } finally {
- cleanup(em, "standDownPdp");
- }
-
- logger.info("standDownPdp: Exiting");
-
- }
-
- /*
- * Determines whether or not a designated PDP has failed.
- *
- * Note: The update method, which is run periodically by the
- * TimerUpdateClass, will un-designate a PDP that is stale.
- */
- @Override
- public boolean hasDesignatedPdpFailed(Collection<DroolsPdp> pdps) {
-
- if (logger.isDebugEnabled()) {
- logger.debug("hasDesignatedPdpFailed: Entering, pdps.size()="
- + pdps.size());
- }
-
- boolean failed = true;
- boolean foundDesignatedPdp = false;
-
- for (DroolsPdp pdp : pdps) {
-
- /*
- * Normally, the update method will un-designate any stale PDP, but
- * we check here to see if the PDP has gone stale since the update
- * method was run.
- *
- * Even if we determine that the designated PDP is current, we keep
- * going (we don't break), so we can get visibility into the other
- * PDPs, when in DEBUG mode.
- */
- if (pdp.isDesignated() && isCurrent(pdp)) {
- if (logger.isDebugEnabled()) {
- logger.debug("hasDesignatedPdpFailed: Designated PDP="
- + pdp.getPdpId() + " is current");
- }
- failed = false;
- foundDesignatedPdp = true;
- } else if (pdp.isDesignated() && !isCurrent(pdp)) {
- logger.error("hasDesignatedPdpFailed: Designated PDP="
- + pdp.getPdpId() + " has failed");
- foundDesignatedPdp = true;
- } else {
- if (logger.isDebugEnabled()) {
- logger.debug("hasDesignatedPdpFailed: PDP="
- + pdp.getPdpId() + " is not designated");
- }
- }
- }
-
- if (logger.isDebugEnabled()) {
- logger.debug("hasDesignatedPdpFailed: Exiting and returning, foundDesignatedPdp="
- + foundDesignatedPdp);
- }
- return failed;
- }
-
-
- private boolean isCurrent(DroolsPdp pdp) {
-
- if (logger.isDebugEnabled()) {
- logger.debug("isCurrent: Entering, pdpId="
- + pdp.getPdpId());
- }
-
- boolean current = false;
-
- // Return if the current PDP is considered "current" based on whatever
- // time box that may be.
- // If the the PDP is not current, we should mark it as not primary in
- // the database
- Date currentDate = new Date();
- long difference = currentDate.getTime()
- - pdp.getUpdatedDate().getTime();
- // just set some kind of default here
- long pdpTimeout = 15000;
- try {
- pdpTimeout = Long.parseLong(IntegrityMonitorProperties
- .getProperty(IntegrityMonitorProperties.PDP_TIMEOUT));
- if (logger.isDebugEnabled()) {
- logger.debug("isCurrent: pdp.timeout=" + pdpTimeout);
- }
- } catch (Exception e) {
- logger.error
- (MessageCodes.EXCEPTION_ERROR, e,
- "isCurrent: Could not get PDP timeout property, using default.");
- }
- current = difference < pdpTimeout;
-
- if (logger.isDebugEnabled()) {
- logger.debug("isCurrent: Exiting, difference="
- + difference + ", pdpTimeout=" + pdpTimeout
- + "; returning current=" + current);
- }
-
- return current;
- }
-
-
- /*
- * Currently this method is only used in a JUnit test environment. Gets a
- * PDP record from droolspdpentity table.
- */
- @Override
- public DroolsPdpEntity getPdp(String pdpId) {
-
- if (logger.isDebugEnabled()) {
- logger.debug("getPdp: Entering and getting PDP with pdpId='" + pdpId
- + "'");
- }
-
- DroolsPdpEntity droolsPdpEntity = null;
-
- EntityManager em = null;
- try {
- em = emf.createEntityManager();
- em.getTransaction().begin();
- Query droolsPdpsListQuery = em
- .createQuery("SELECT p FROM DroolsPdpEntity p WHERE p.pdpId=:pdpId");
- droolsPdpsListQuery.setParameter("pdpId", pdpId);
- List<?> droolsPdpsList = droolsPdpsListQuery.setLockMode(
- LockModeType.NONE).setFlushMode(FlushModeType.COMMIT).getResultList();
- if (droolsPdpsList.size() == 1
- && droolsPdpsList.get(0) instanceof DroolsPdpEntity) {
- droolsPdpEntity = (DroolsPdpEntity) droolsPdpsList.get(0);
- if (logger.isDebugEnabled()) {
- logger.debug("getPdp: PDP=" + pdpId
- + " found, isDesignated="
- + droolsPdpEntity.isDesignated() + ", updatedDate="
- + droolsPdpEntity.getUpdatedDate() + ", priority="
- + droolsPdpEntity.getPriority());
- }
-
- // Make sure the droolsPdpEntity is not a cached version
- em.refresh(droolsPdpEntity);
-
- em.getTransaction().commit();
- } else {
- logger.error("getPdp: PDP=" + pdpId + " not found!?");
- }
- } catch (Exception e) {
- logger.error
- (MessageCodes.EXCEPTION_ERROR, e,"getPdp: Caught Exception attempting to get PDP, message='"
- + e.getMessage() + "'");
- } finally {
- cleanup(em, "getPdp");
- }
-
- if (logger.isDebugEnabled()) {
- logger.debug("getPdp: Returning droolsPdpEntity=" + droolsPdpEntity);
- }
- return droolsPdpEntity;
-
- }
-
- /*
- * Normally this method should only be used in a JUnit test environment.
- * Manually inserts a PDP record in droolspdpentity table.
- */
- @Override
- public void insertPdp(DroolsPdp pdp) {
-
- logger.info("insertPdp: Entering and manually inserting PDP");
-
- /*
- * Start transaction
- */
- EntityManager em = emf.createEntityManager();
- try {
- em.getTransaction().begin();
-
- /*
- * Insert record.
- */
- DroolsPdpEntity droolsPdpEntity = new DroolsPdpEntity();
- em.persist(droolsPdpEntity);
- droolsPdpEntity.setPdpId(pdp.getPdpId());
- droolsPdpEntity.setDesignated(pdp.isDesignated());
- droolsPdpEntity.setPriority(pdp.getPriority());
- droolsPdpEntity.setUpdatedDate(pdp.getUpdatedDate());
- droolsPdpEntity.setSiteName(pdp.getSiteName());
-
- /*
- * End transaction.
- */
- em.getTransaction().commit();
- } finally {
- cleanup(em, "insertPdp");
- }
-
- logger.info("insertPdp: Exiting");
-
- }
-
- /*
- * Normally this method should only be used in a JUnit test environment.
- * Manually deletes all PDP records in droolspdpentity table.
- */
- @Override
- public void deleteAllPdps() {
-
- logger.info("deleteAllPdps: Entering");
-
- /*
- * Start transaction
- */
- EntityManager em = emf.createEntityManager();
- try {
- em.getTransaction().begin();
-
- Query droolsPdpsListQuery = em
- .createQuery("SELECT p FROM DroolsPdpEntity p");
- @SuppressWarnings("unchecked")
- List<DroolsPdp> droolsPdpsList = droolsPdpsListQuery.setLockMode(
- LockModeType.NONE).setFlushMode(FlushModeType.COMMIT).getResultList();
- logger.info("deleteAllPdps: Deleting " + droolsPdpsList.size() + " PDPs");
- for (DroolsPdp droolsPdp : droolsPdpsList) {
- String pdpId = droolsPdp.getPdpId();
- deletePdp(pdpId);
- }
-
- /*
- * End transaction.
- */
- em.getTransaction().commit();
- } finally {
- cleanup(em, "deleteAllPdps");
- }
-
- logger.info("deleteAllPdps: Exiting");
-
- }
-
- /*
- * Normally this method should only be used in a JUnit test environment.
- * Manually deletes a PDP record in droolspdpentity table.
- */
- @Override
- public void deletePdp(String pdpId) {
-
- logger.info("deletePdp: Entering and manually deleting pdpId='" + pdpId
- + "'");
-
- /*
- * Start transaction
- */
- EntityManager em = emf.createEntityManager();
- try {
- em.getTransaction().begin();
-
- /*
- * Delete record.
- */
- DroolsPdpEntity droolsPdpEntity = em.find(DroolsPdpEntity.class, pdpId);
- if (droolsPdpEntity != null) {
- logger.info("deletePdp: Removing PDP");
- em.remove(droolsPdpEntity);
- } else {
- logger.info("deletePdp: PDP with ID='" + pdpId
- + "' not currently in DB");
- }
-
- /*
- * End transaction.
- */
- em.getTransaction().commit();
- } finally {
- cleanup(em, "deletePdp");
- }
-
- logger.info("deletePdp: Exiting");
-
- }
-
- /*
- * Normally this method should only be used in a JUnit test environment.
- * Manually deletes all records in droolsessionentity table.
- */
- @Override
- public void deleteAllSessions() {
-
- logger.info("deleteAllSessions: Entering");
-
- /*
- * Start transaction
- */
- EntityManager em = emf.createEntityManager();
-
- try {
- em.getTransaction().begin();
-
- Query droolsSessionListQuery = em
- .createQuery("SELECT p FROM DroolsSessionEntity p");
- @SuppressWarnings("unchecked")
- List<DroolsSession> droolsSessionsList = droolsSessionListQuery.setLockMode(
- LockModeType.NONE).setFlushMode(FlushModeType.COMMIT).getResultList();
- logger.info("deleteAllSessions: Deleting " + droolsSessionsList.size() + " Sessions");
- for (DroolsSession droolsSession : droolsSessionsList) {
- logger.info("deleteAllSessions: Deleting droolsSession with pdpId="
- + droolsSession.getPdpId() + " and sessionId="
- + droolsSession.getSessionId());
- em.remove(droolsSession);
- }
-
- /*
- * End transaction.
- */
- em.getTransaction().commit();
- } finally {
- cleanup(em, "deleteAllSessions");
- }
- logger.info("deleteAllSessions: Exiting");
-
- }
-
-
- /*
- * Close the specified EntityManager, rolling back any pending transaction
- *
- * @param em the EntityManager to close ('null' is OK)
- * @param method the invoking Java method (used for log messages)
- */
- private static void cleanup(EntityManager em, String method)
- {
- if (em != null) {
- if (em.isOpen()) {
- if (em.getTransaction().isActive()) {
- // there is an active EntityTransaction -- roll it back
- try {
- em.getTransaction().rollback();
- } catch (Exception e) {
- logger.error(method + ": Caught Exception attempting to rollback EntityTransaction, message='"
- + e.getMessage() + "'");
- }
- }
-
- // now, close the EntityManager
- try {
- em.close();
- } catch (Exception e) {
- logger.error(method + ": Caught Exception attempting to close EntityManager, message='"
- + e.getMessage() + "'");
- }
- }
- }
- }
-}
diff --git a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/PersistenceFeature.java b/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/PersistenceFeature.java
deleted file mode 100644
index 4d9c08a..0000000
--- a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/PersistenceFeature.java
+++ /dev/null
@@ -1,656 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.policy.drools.persistence;
-
-import java.io.IOException;
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.PreparedStatement;
-import java.sql.SQLException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Properties;
-
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.Persistence;
-
-import org.eclipse.persistence.config.PersistenceUnitProperties;
-import org.kie.api.KieServices;
-import org.kie.api.runtime.Environment;
-import org.kie.api.runtime.EnvironmentName;
-import org.kie.api.runtime.KieSession;
-import org.kie.api.runtime.KieSessionConfiguration;
-import org.openecomp.policy.common.ia.IntegrityAudit;
-import org.openecomp.policy.common.ia.IntegrityAuditProperties;
-import org.openecomp.policy.common.im.StateManagement;
-import org.openecomp.policy.common.logging.eelf.MessageCodes;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.common.logging.flexlogger.PropertyUtil;
-import org.openecomp.policy.drools.core.DroolsPDPIntegrityMonitor;
-import org.openecomp.policy.drools.core.PolicySessionFeatureAPI;
-import org.openecomp.policy.drools.core.IntegrityMonitorProperties;
-import org.openecomp.policy.drools.core.PolicyContainer;
-import org.openecomp.policy.drools.core.PolicySession;
-import org.openecomp.policy.drools.features.PolicyEngineFeatureAPI;
-import org.openecomp.policy.drools.im.PMStandbyStateChangeNotifier;
-import org.openecomp.policy.drools.system.PolicyEngine;
-
-import bitronix.tm.Configuration;
-import bitronix.tm.TransactionManagerServices;
-import bitronix.tm.resource.jdbc.PoolingDataSource;
-
-/**
- * If this feature is supported, there is a single instance of it.
- * It adds persistence to Drools sessions, but it is also intertwined with
- * active/standby state management and IntegrityMonitor. For now, they are
- * all treated as a single feature, but it would be nice to separate them.
- *
- * The bulk of the code here was once in other classes, such as
- * 'PolicyContainer' and 'Main'. It was moved here as part of making this
- * a separate optional feature.
- */
-public class PersistenceFeature implements PolicySessionFeatureAPI, PolicyEngineFeatureAPI
-{
- // get an instance of logger
- private static Logger logger =
- FlexLogger.getLogger(PersistenceFeature.class);
-
- // 'KieServices' singleton
- static private KieServices kieServices = KieServices.Factory.get();
-
- private static DroolsPdp myPdp;
- private static Object myPdpSync = new Object();
- private static DroolsPdpsElectionHandler electionHandler;
-
- // indicates whether persistence has been disabled
- private static boolean persistenceDisabled = false;
-
- /*
- * Used by JUnit testing to verify whether or not audit is running.
- */
- private static IntegrityAudit integrityAudit = null;
-
- /**
- * Lookup the adjunct for this feature that is associated with the
- * specified PolicyContainer. If not found, create one.
- *
- * @param policyContainer the container whose adjunct we are looking up,
- * and possibly creating
- * @return the associated 'ContainerAdjunct' instance, which may be new
- */
- private ContainerAdjunct getContainerAdjunct(PolicyContainer policyContainer)
- {
- Object rval = policyContainer.getAdjunct(this);
- if (rval == null || ! (rval instanceof ContainerAdjunct))
- {
- // adjunct does not exist, or has the wrong type (should never happen)
- rval = new ContainerAdjunct(policyContainer);
- policyContainer.setAdjunct(this, rval);
- }
- return((ContainerAdjunct)rval);
- }
-
- /**************************/
- /* 'FeatureAPI' interface */
- /**************************/
-
- /**
- * {@inheritDoc}
- */
- @Override
- public int getSequenceNumber()
- {
- return(1);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void globalInit(String args[], String configDir)
- {
- // Initialization code associated with 'PolicyContainer'
- DroolsPDPIntegrityMonitor droolsPdpIntegrityMonitor = null;
- try
- {
- droolsPdpIntegrityMonitor = DroolsPDPIntegrityMonitor.init(configDir);
- }
- catch (Exception e)
- {
- logger.error(MessageCodes.EXCEPTION_ERROR, e,
- "main", "DroolsPDPIntegrityMonitor.init()");
- }
-
- initializePersistence(configDir, droolsPdpIntegrityMonitor);
-
- // 1. Start Integrity Monitor (unless it was specifically disabled in the CORE layer
-
-
- if (persistenceDisabled) {
- System.out.println("WARNING: Starting Engine with Persistance disabled");
- logger.warn("Starting Engine with Persistance disabled");
- } else {
- DroolsPDPIntegrityMonitor im = null;
- //At this point the DroolsPDPIntegrityMonitor instance must exist
- try {
- im = DroolsPDPIntegrityMonitor.getInstance();
- } catch (Exception e1) {
- String msg = "policy-core startup failed to get DroolsPDPIntegrityMonitor instance: \n" + e1;
- System.out.println(msg);
- e1.printStackTrace();
- }
- //Now get the StateManagement instance so we can register our observer
- StateManagement sm = im.getStateManager();
-
- //Create an instance of the Observer
- PMStandbyStateChangeNotifier pmNotifier = new PMStandbyStateChangeNotifier();
-
- //Register the PMStandbyStateChangeNotifier Observer
- sm.addObserver(pmNotifier);
- }
- }
-
- /**
- * This is a hook to create a new persistent KieSession.
- *
- * {@inheritDoc}
- */
- @Override
- public KieSession activatePolicySession
- (PolicyContainer policyContainer, String name, String kieBaseName)
- {
- return(getContainerAdjunct(policyContainer)
- .newPersistentKieSession(name, kieBaseName));
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void disposeKieSession(PolicySession policySession)
- {
- // TODO: There should be one data source per session
- getContainerAdjunct(policySession.getPolicyContainer())
- .disposeKieSession();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void destroyKieSession(PolicySession policySession)
- {
- // TODO: There should be one data source per session
- getContainerAdjunct(policySession.getPolicyContainer())
- .destroyKieSession();
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean afterStart(PolicyEngine engine)
- {
- // ASSERTION: engine == PolicyEngine.manager
- PolicyEngine.manager.lock();
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean beforeActivate(PolicyEngine engine)
- {
- if (persistenceDisabled)
- {
- return(false);
- }
-
- // The following code will remove "old" Drools 'sessioninfo' records, so
- // they aren't used to restore data to Drools sessions. This also has the
- // useful side-effect of removing abandoned records as well.
-
- // Fetch the timeout value, in seconds. If it is not specified or is
- // less than or equal to 0, no records are removed.
-
- String timeoutString = null;
- int timeout = 0;
- try
- {
- timeoutString = DroolsPersistenceProperties.getProperty
- ("persistence.sessioninfo.timeout");
- if (timeoutString != null)
- {
- // timeout parameter is specified
- timeout = Integer.valueOf(timeoutString);
- }
- }
- catch (NumberFormatException e)
- {
- logger.error("Invalid value for Drools persistence property "
- + "persistence.sessioninfo.timeout: "
- + timeoutString);
- }
- if (timeout <= 0)
- {
- // parameter is not specified, is <= 0, or is an invalid number
- return(false);
- }
-
- // if we reach this point, we are ready to remove old records from
- // the database
-
- Connection connection = null;
- PreparedStatement statement = null;
- try
- {
- // fetch database parameters from properties
-
- String url = DroolsPersistenceProperties.getProperty
- (DroolsPersistenceProperties.DB_URL);
- String user = DroolsPersistenceProperties.getProperty
- (DroolsPersistenceProperties.DB_USER);
- String password = DroolsPersistenceProperties.getProperty
- (DroolsPersistenceProperties.DB_PWD);
-
- if (url != null && user != null && password != null)
- {
- // get DB connection
- connection = DriverManager.getConnection(url, user, password);
-
- // create statement to delete old records
- statement = connection.prepareStatement
- ("DELETE FROM sessioninfo WHERE "
- + "timestampdiff(second,lastmodificationdate,now()) > ?");
- statement.setInt(1,timeout);
-
- // execute statement
- int count = statement.executeUpdate();
- logger.info("Cleaning up sessioninfo table -- "
- + count + " records removed");
- }
- }
- catch (SQLException e)
- {
- logger.error("Clean up of sessioninfo table failed", e);
- }
- finally
- {
- // cleanup
- if (statement != null)
- {
- try
- {
- statement.close();
- }
- catch (SQLException e)
- {
- logger.error("SQL connection close failed", e);
- }
- }
- if (connection != null)
- {
- try
- {
- connection.close();
- }
- catch (SQLException e)
- {
- logger.error("SQL connection close failed", e);
- }
- }
- }
- return(false);
- }
-
- /**************************/
-
- /**
- * @return 'true' if Drools persistence is disabled, and 'false' if not
- */
- static public boolean getPersistenceDisabled()
- {
- return(persistenceDisabled);
- }
-
- /**
- * Read in the persistence properties, determine whether persistence is
- * enabled or disabled, and initialize persistence if enabled.
- */
- private static void initializePersistence(String configDir, DroolsPDPIntegrityMonitor droolsPdpIntegrityMonitor)
- {
-
- try {
- Properties pDrools = PropertyUtil.getProperties(configDir
- + "/droolsPersistence.properties");
- DroolsPersistenceProperties.initProperties(pDrools);
- Properties pXacml = PropertyUtil.getProperties(configDir
- + "/xacmlPersistence.properties");
- XacmlPersistenceProperties.initProperties(pXacml);
- if ("true".equals(pDrools.getProperty("persistenceDisabled"))) {
- // 'persistenceDisabled' only relates to the 'drools'
- // database. The fact that integrityMonitor/xacml depends upon
- // persistence is an implementation detail there (which can't
- // currently be disabled), and doesn't directly affect
- // 'policy-core'.
- persistenceDisabled = true;
- }
- } catch (IOException e1) {
- logger.error(MessageCodes.MISS_PROPERTY_ERROR, e1,
- "initializePersistence");
- }
-
- /*
- * Might as well handle the Integrity Monitor properties here, too.
- */
- try {
- Properties pIm =
- PropertyUtil.getProperties(configDir + "/IntegrityMonitor.properties");
- IntegrityMonitorProperties.initProperties(pIm);
- logger.info("initializePersistence: resourceName=" + IntegrityMonitorProperties.getProperty(IntegrityMonitorProperties.PDP_INSTANCE_ID));
- } catch (IOException e1) {
- logger.error(MessageCodes.MISS_PROPERTY_ERROR, e1, "initializePersistence");
- }
-
-
- if (persistenceDisabled) {
- // The persistence design is tied to 'DroolsPdpsElectionHandler',
- // so we should bypass that as well. This also means that we
- // won't get active/standby notifications, so we need to go
- // into the 'active' state in order to have any 'PolicySession'
- // instances.
- return;
- }
-
- DroolsPdpsConnector conn = getDroolsPdpsConnector("ncompPU");
- String uniquePdpId = IntegrityMonitorProperties.getProperty(IntegrityMonitorProperties.PDP_INSTANCE_ID);
- if(uniquePdpId == null){
- throw new NullPointerException();
- }
-
- /*
- * In a JUnit test environment, one or more PDPs may already have been
- * inserted in the DB, so we need to check for this.
- */
- DroolsPdp existingPdp = conn.getPdp(uniquePdpId);
- if (existingPdp != null) {
- System.out.println("Found existing PDP record, pdpId="
- + existingPdp.getPdpId() + ", isDesignated="
- + existingPdp.isDesignated() + ", updatedDate="
- + existingPdp.getUpdatedDate());
- myPdp = existingPdp;
- }
-
- /*
- * Kick off integrity audit for Drools DB.
- */
- startIntegrityAudit(configDir);
-
- synchronized(myPdpSync){
- if(myPdp == null){
-
- myPdp = new DroolsPdpImpl(uniquePdpId,false,4,new Date());
- }
- if(myPdp != null){
- String site_name = "";
- site_name = IntegrityMonitorProperties.getProperty(IntegrityMonitorProperties.SITE_NAME);
- if (site_name == null) {
- site_name = "";
- }else{
- site_name = site_name.trim();
- }
- myPdp.setSiteName(site_name);
- }
- if(electionHandler == null){
- electionHandler = new DroolsPdpsElectionHandler(conn,myPdp,droolsPdpIntegrityMonitor);
- }
- }
- Configuration bitronixConfiguration = TransactionManagerServices.getConfiguration();
- bitronixConfiguration.setJournal(null);
- bitronixConfiguration.setServerId(uniquePdpId);
- System.out.println("\n\nThis controller is a standby, waiting to be chosen as primary...\n\n");
- logger.info("\n\nThis controller is a standby, waiting to be chosen as primary...\n\n");
- }
-
- private static void startIntegrityAudit(String configDir) {
-
- logger.info("startIntegrityAudit: Entering, configDir='" + configDir
- + "'");
-
- /*
- * Initialize Integrity Audit properties. file.
- */
- try {
-
- String resourceName = IntegrityMonitorProperties
- .getProperty(IntegrityMonitorProperties.PDP_INSTANCE_ID);
-
- /*
- * Load properties for auditing of Drools DB.
- */
- Properties droolsPia = PropertyUtil.getProperties(configDir
- + "/IntegrityMonitor.properties");
-
- /*
- * Supplement properties specific to the IntegrityMonitor (e.g.
- * site_name, node_type, resource.name) with properties specific to
- * persisting Drools DB entities (see
- * ../policy-core/src/main/resources/persistence.xml)
- *
- * Note: integrity_audit_period_seconds is defined in
- * IntegrityMonitor.properties, rather than creating a whole new
- * "IntegrityAudit.properties" file for just one property.
- */
- droolsPia
- .setProperty(
- IntegrityAuditProperties.DB_DRIVER,
- DroolsPersistenceProperties
- .getProperty(DroolsPersistenceProperties.DB_DRIVER));
- droolsPia.setProperty(IntegrityAuditProperties.DB_PWD,
- DroolsPersistenceProperties
- .getProperty(DroolsPersistenceProperties.DB_PWD));
- droolsPia.setProperty(IntegrityAuditProperties.DB_URL,
- DroolsPersistenceProperties
- .getProperty(DroolsPersistenceProperties.DB_URL));
- droolsPia.setProperty(IntegrityAuditProperties.DB_USER,
- DroolsPersistenceProperties
- .getProperty(DroolsPersistenceProperties.DB_USER));
-
- /*
- * Start audit for Drools DB.
- */
- integrityAudit = new IntegrityAudit(
- resourceName, "auditDroolsPU", droolsPia);
- integrityAudit.startAuditThread();
-
- } catch (IOException e1) {
- logger.error(
- MessageCodes.MISS_PROPERTY_ERROR,
- e1,
- "initializePersistence: IntegrityAuditProperties: "
- + e1.getMessage());
- } catch (Exception e2) {
- logger.error(
- MessageCodes.EXCEPTION_ERROR,
- e2,
- "initializePersistence: IntegrityAuditProperties: "
- + e2.getMessage());
- }
-
- logger.debug("startIntegrityAudit: Exiting");
-
- }
-
- /*
- * Moved code to instantiate a JpaDroolsPdpsConnector object from main() to
- * this method, so it can also be accessed from StandbyStateChangeNotifier
- * class.
- */
- public static DroolsPdpsConnector getDroolsPdpsConnector(String pu) {
-
- Map<String, Object> propMap = new HashMap<String, Object>();
- propMap.put("javax.persistence.jdbc.driver", DroolsPersistenceProperties
- .getProperty(DroolsPersistenceProperties.DB_DRIVER));
- propMap.put("javax.persistence.jdbc.url",
- DroolsPersistenceProperties.getProperty(DroolsPersistenceProperties.DB_URL));
- propMap.put("javax.persistence.jdbc.user", DroolsPersistenceProperties
- .getProperty(DroolsPersistenceProperties.DB_USER));
- propMap.put("javax.persistence.jdbc.password",
- DroolsPersistenceProperties.getProperty(DroolsPersistenceProperties.DB_PWD));
-
- EntityManagerFactory emf = Persistence.createEntityManagerFactory(
- pu, propMap);
- DroolsPdpsConnector conn = new JpaDroolsPdpsConnector(emf);
-
- return conn;
- }
-
- /*
- * IntegrityAudit instance is needed by JUnit testing to ascertain whether
- * or not audit is running.
- */
- public static IntegrityAudit getIntegrityAudit() {
-
- return integrityAudit;
-
- }
-
- /* ============================================================ */
-
- /**
- * Each instance of this class is a logical extension of a 'PolicyContainer'
- * instance. It's reference is stored in the 'adjuncts' table within the
- * 'PolicyContainer', and will be garbage-collected with the container.
- */
- class ContainerAdjunct
- {
- // this is the 'PolicyContainer' instance that this adjunct is extending
- private PolicyContainer policyContainer;
- private PoolingDataSource ds = null;
-
- /**
- * Constructor - initialize a new 'ContainerAdjunct'
- *
- * @param policyContainer the 'PolicyContainer' instance this adjunct
- * is extending
- */
- ContainerAdjunct(PolicyContainer policyContainer)
- {
- this.policyContainer = policyContainer;
- }
-
- /**
- * Create a new persistent KieSession. If there is already a corresponding
- * entry in the database, it is used to initialize the KieSession. If not,
- * a completely new session is created.
- *
- * @param name the name of the KieSession (which is also the name of
- * the associated PolicySession)
- * @param kieBaseName the name of the 'KieBase' instance containing
- * this session
- * @return a new KieSession with persistence enabled (if persistence is
- * disabled, 'null' is returned
- */
- private KieSession newPersistentKieSession(String name, String kieBaseName)
- {
- if (persistenceDisabled)
- {
- return(null);
- }
- long desiredSessionId = -1;
- synchronized (myPdpSync) {
-
-
-
- for(DroolsSession droolsSession : electionHandler.getSessions()){
- if(droolsSession.getSessionName().equals(name)){
- desiredSessionId = droolsSession.getSessionId();
- }
- }
- }
- System.out.println("\n\nThis controller is primary... coming up with session "+desiredSessionId+"\n\n");
- logger.info("\n\nThis controller is primary... coming up with session "+desiredSessionId+"\n\n");
- Map<String, Object> props = new HashMap<String, Object>();
- props.put("URL", DroolsPersistenceProperties.getProperty(DroolsPersistenceProperties.DB_URL));
- props.put("user", DroolsPersistenceProperties.getProperty(DroolsPersistenceProperties.DB_USER));
- props.put("password", DroolsPersistenceProperties.getProperty(DroolsPersistenceProperties.DB_PWD));
- props.put("dataSource",DroolsPersistenceProperties.getProperty(DroolsPersistenceProperties.DB_DATA_SOURCE));
- logger.info("getPolicySession:session does not exist -- attempt to create one with name " + name);
- // session does not exist -- attempt to create one
- System.getProperties().put("java.naming.factory.initial","bitronix.tm.jndi.BitronixInitialContextFactory");
- Environment env = kieServices.newEnvironment();
- //kContainer.newKieBase(null);
- ds = new PoolingDataSource();
- ds.setUniqueName("jdbc/BitronixJTADataSource"+name);
- ds.setClassName( (String)props.remove("dataSource"));
- //ds.setClassName( "org.h2.Driver" );
- ds.setMaxPoolSize( 3 );
- ds.setIsolationLevel("SERIALIZABLE");
- ds.setAllowLocalTransactions( true );
- //ds.getDriverProperties().put( "user", "sa" );
- //ds.getDriverProperties().put( "password", "" );
- //ds.getDriverProperties().put( "URL", "jdbc:h2:tcp://localhost/drools" );
- ds.getDriverProperties().putAll(props);
- ds.init();
- Properties emfProperties = new Properties();
- emfProperties.setProperty(PersistenceUnitProperties.JTA_DATASOURCE, "jdbc/BitronixJTADataSource"+name);
- env.set(EnvironmentName.ENTITY_MANAGER_FACTORY, Persistence.createEntityManagerFactory("ncompsessionsPU",emfProperties));
- env.set(EnvironmentName.TRANSACTION_MANAGER,TransactionManagerServices.getTransactionManager());
- KieSessionConfiguration kConf = KieServices.Factory.get().newKieSessionConfiguration();
- KieSession kieSession;
- try{
- kieSession = kieServices.getStoreServices().loadKieSession(desiredSessionId, policyContainer.getKieContainer().getKieBase(kieBaseName), kConf, env);
- System.out.println("LOADING We can load session "+desiredSessionId+", going to create a new one");
- logger.info("LOADING We can load session "+desiredSessionId+", going to create a new one");
- }catch(Exception e){
- System.out.println("LOADING We cannot load session "+desiredSessionId+", going to create a new one");
-
- logger.info("LOADING We cannot load session "+desiredSessionId+", going to create a new one");
- kieSession = kieServices.getStoreServices().newKieSession(policyContainer.getKieContainer().getKieBase(kieBaseName), null, env);
- System.out.println("LOADING CREATED "+kieSession.getIdentifier());
- logger.info("LOADING CREATED "+kieSession.getIdentifier());
- }
- synchronized (myPdpSync) {
- myPdp.setSessionId(name,kieSession.getIdentifier());
- electionHandler.updateMyPdp();
- }
- return(kieSession);
- }
-
- private void disposeKieSession()
- {
- if (ds != null)
- {
- ds.close();
- ds = null;
- }
- }
-
- private void destroyKieSession()
- {
- // does the same thing as 'dispose'
- disposeKieSession();
- }
- }
-}
diff --git a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/ThreadRunningChecker.java b/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/ThreadRunningChecker.java
deleted file mode 100644
index ccec824..0000000
--- a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/ThreadRunningChecker.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.policy.drools.persistence;
-
-public interface ThreadRunningChecker {
- public void checkThreadStatus();
-
-}
diff --git a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/XacmlPersistenceProperties.java b/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/XacmlPersistenceProperties.java
deleted file mode 100644
index 7e2388e..0000000
--- a/policy-persistence/src/main/java/org/openecomp/policy/drools/persistence/XacmlPersistenceProperties.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.policy.drools.persistence;
-
-import java.util.Properties;
-
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-
-
-public class XacmlPersistenceProperties {
- // get an instance of logger
- private static Logger logger = FlexLogger.getLogger(XacmlPersistenceProperties.class);
- /*
- * xacmlPersistence.properties parameter key values
- */
- public static final String DB_DRIVER = "javax.persistence.jdbc.driver";
- public static final String DB_DATA_SOURCE = "hibernate.dataSource";
- public static final String DB_URL = "javax.persistence.jdbc.url";
- public static final String DB_USER = "javax.persistence.jdbc.user";
- public static final String DB_PWD = "javax.persistence.jdbc.password";
-
- private static Properties properties = null;
- /*
- * Initialize the parameter values from the droolsPersitence.properties file values
- *
- * This is designed so that the Properties object is obtained from the xacmlPersistence.properties
- * file and then is passed to this method to initialize the value of the parameters.
- * This allows the flexibility of JUnit tests using getProperties(filename) to get the
- * properties while runtime methods can use getPropertiesFromClassPath(filename).
- *
- */
- public static void initProperties (Properties prop){
- logger.info("XacmlPersistenceProperties.initProperties(Properties): entry");
- logger.info("\n\nXacmlPersistenceProperties.initProperties: Properties = \n" + prop + "\n\n");
-
- properties = prop;
- }
-
- public static String getProperty(String key){
- return properties.getProperty(key);
- }
-
- public static Properties getProperties() {
- return properties;
- }
-}
diff --git a/policy-persistence/src/main/resources/META-INF/services/org.openecomp.policy.drools.core.PolicySessionFeatureAPI b/policy-persistence/src/main/resources/META-INF/services/org.openecomp.policy.drools.core.PolicySessionFeatureAPI
deleted file mode 100644
index 540a4bd..0000000
--- a/policy-persistence/src/main/resources/META-INF/services/org.openecomp.policy.drools.core.PolicySessionFeatureAPI
+++ /dev/null
@@ -1 +0,0 @@
-org.openecomp.policy.drools.persistence.PersistenceFeature
diff --git a/policy-persistence/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI b/policy-persistence/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI
deleted file mode 100644
index 540a4bd..0000000
--- a/policy-persistence/src/main/resources/META-INF/services/org.openecomp.policy.drools.features.PolicyEngineFeatureAPI
+++ /dev/null
@@ -1 +0,0 @@
-org.openecomp.policy.drools.persistence.PersistenceFeature
diff --git a/policy-persistence/src/test/java/org/openecomp/policy/drools/controller/test/IntegrityAuditIntegrationTest.java b/policy-persistence/src/test/java/org/openecomp/policy/drools/controller/test/IntegrityAuditIntegrationTest.java
deleted file mode 100644
index c57e3e9..0000000
--- a/policy-persistence/src/test/java/org/openecomp/policy/drools/controller/test/IntegrityAuditIntegrationTest.java
+++ /dev/null
@@ -1,265 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.policy.drools.controller.test;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.Date;
-import java.util.Properties;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
-
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.openecomp.policy.common.ia.IntegrityAudit;
-import org.openecomp.policy.common.im.StateManagement;
-import org.openecomp.policy.common.logging.eelf.PolicyLogger;
-import org.openecomp.policy.drools.core.IntegrityMonitorProperties;
-import org.openecomp.policy.drools.core.PolicyContainer;
-import org.openecomp.policy.drools.im.PMStandbyStateChangeNotifier;
-import org.openecomp.policy.drools.persistence.DroolsPdpEntity;
-import org.openecomp.policy.drools.persistence.DroolsPdpImpl;
-import org.openecomp.policy.drools.persistence.DroolsPdpsConnector;
-import org.openecomp.policy.drools.persistence.DroolsPersistenceProperties;
-import org.openecomp.policy.drools.persistence.JpaDroolsPdpsConnector;
-import org.openecomp.policy.drools.persistence.PersistenceFeature;
-import org.openecomp.policy.drools.persistence.XacmlPersistenceProperties;
-import org.openecomp.policy.drools.system.Main;
-import org.openecomp.policy.drools.system.PolicyEngine;
-
-/*
- * Cloned from StandbyStateManagement.java in support of US673632.
- * See MultiSite_v1-10.ppt, slide 38
- */
-public class IntegrityAuditIntegrationTest {
-
-
- public static final String INTEGRITY_MONITOR_PROPERTIES_FILE="src/test/server/config/IntegrityMonitor.properties";
-
- /*
- * Sleep 5 seconds after each test to allow interrupt (shutdown) recovery.
- */
- private long interruptRecoveryTime = 5000;
-
- /*
- * See the IntegrityMonitor.getJmxUrl() method for the rationale behind this jmx related processing.
- */
- @BeforeClass
- public static void setUpClass() throws Exception {
-
- PolicyLogger.info("setUpClass: Entering");
-
- String userDir = System.getProperty("user.dir");
- PolicyLogger.debug("setUpClass: userDir=" + userDir);
- System.setProperty("com.sun.management.jmxremote.port", "9980");
- System.setProperty("com.sun.management.jmxremote.authenticate","false");
-
- // Make sure path to config directory is set correctly in PolicyContainer.main
- // Also make sure we ignore HTTP server failures resulting from port conflicts.
- PolicyContainer.isUnitTesting = true;
-
- /*
- * Setting isUnitTesting to true ensures
- *
- * 1) That we load test version of properties files
- *
- * and
- *
- * 2) that we use dbAuditSimulate() method, because all we care about
- * for this JUnit testing is that the audits are executed.
- */
- IntegrityAudit.isUnitTesting = true;
-
- initializeDb();
-
- PolicyLogger.info("setUpClass: Exiting");
-
- }
-
- @AfterClass
- public static void tearDownClass() throws Exception {
-
- }
-
- @Before
- public void setUp() throws Exception {
-
- }
-
- @After
- public void tearDown() throws Exception {
-
- }
-
-
- /*
- * Verifies that audit thread starts successfully.
- */
- //@Ignore
- @Test
- public void testAuditInit() throws Exception {
-
- PolicyLogger.debug("\n\ntestAuditInit: Entering\n\n");
-
- PolicyLogger.debug("testAuditInit: Reading IntegrityMonitorProperties");
- Properties integrityMonitorProperties = new Properties();
- integrityMonitorProperties.load(new FileInputStream(new File(
- INTEGRITY_MONITOR_PROPERTIES_FILE)));
- IntegrityMonitorProperties.initProperties(integrityMonitorProperties);
- String thisPdpId = IntegrityMonitorProperties
- .getProperty(IntegrityMonitorProperties.PDP_INSTANCE_ID);
-
- PolicyLogger.debug("testAuditInit: Reading xacmlPersistenceProperties");
- Properties xacmlPersistenceProperties = new Properties();
- xacmlPersistenceProperties.load(new FileInputStream(new File(
- "src/test/server/config/xacmlPersistence.properties")));
- XacmlPersistenceProperties.initProperties(xacmlPersistenceProperties);
-
- PolicyLogger.debug("testAuditInit: Creating emfXacml");
- EntityManagerFactory emfXacml = Persistence.createEntityManagerFactory(
- "junitXacmlPU", xacmlPersistenceProperties);
-
- PolicyLogger.debug("testAuditInit: Reading droolsPersistenceProperties");
- Properties droolsPersistenceProperties = new Properties();
- droolsPersistenceProperties.load(new FileInputStream(new File(
- "src/test/server/config/droolsPersistence.properties")));
- DroolsPersistenceProperties.initProperties(droolsPersistenceProperties);
-
- PolicyLogger.debug("testAuditInit: Creating emfDrools");
- EntityManagerFactory emfDrools = Persistence.createEntityManagerFactory(
- "junitDroolsPU", droolsPersistenceProperties);
-
- DroolsPdpsConnector conn = new JpaDroolsPdpsConnector(emfDrools);
-
- PolicyLogger.debug("testAuditInit: Cleaning up tables");
- conn.deleteAllSessions();
- conn.deleteAllPdps();
-
- /*
- * Insert this PDP as designated. Initial standby state will be
- * either null or cold standby.
- */
- PolicyLogger.debug("testAuditInit: Inserting PDP=" + thisPdpId + " as designated");
- DroolsPdpImpl pdp = new DroolsPdpImpl(thisPdpId, true, 4, new Date());
- conn.insertPdp(pdp);
- DroolsPdpEntity droolsPdpEntity = conn.getPdp(thisPdpId);
- PolicyLogger.debug("testAuditInit: After insertion, PDP=" + thisPdpId + " has DESIGNATED="
- + droolsPdpEntity.isDesignated());
- assertTrue(droolsPdpEntity.isDesignated() == true);
-
- PolicyLogger.debug("testAuditInit: Instantiating stateManagement object");
- StateManagement sm = new StateManagement(emfXacml, "dummy");
- sm.deleteAllStateManagementEntities();
- sm = new StateManagement(emfXacml, thisPdpId);
- PMStandbyStateChangeNotifier pmStandbyStateChangeNotifier = new PMStandbyStateChangeNotifier();
- sm.addObserver(pmStandbyStateChangeNotifier);
-
- PolicyLogger.debug("testAuditInit: Running policy-management.Main class, designated="
- + conn.getPdp(thisPdpId).isDesignated());
- PolicyManagementRunner policyManagementRunner = new PolicyManagementRunner();
- policyManagementRunner.start();
-
- PolicyLogger.debug("testAuditInit: Runner started; Sleeping "
- + interruptRecoveryTime + "ms before promoting PDP="
- + thisPdpId);
- Thread.sleep(interruptRecoveryTime);
-
- IntegrityAudit integrityAudit = PersistenceFeature.getIntegrityAudit();
- PolicyLogger.debug("testAuditInit: isThreadInitialized=" + integrityAudit.isThreadInitialized());
- assertTrue("AuditThread not initialized!?",integrityAudit.isThreadInitialized());
-
- PolicyLogger.debug("testAuditInit: Stopping auditThread");
- integrityAudit.stopAuditThread();
- Thread.sleep(1000);
- //This will interrupt thread. However, the thread will not die. It keeps on ticking and trying to
- //run the audit.
- assertTrue("AuditThread not still running after stopAuditThread invoked!?",integrityAudit.isThreadInitialized());
-
- PolicyLogger.debug("testAuditInit: Stopping policyManagementRunner");
- policyManagementRunner.stopRunner();
-
- PolicyLogger.debug("\n\ntestAuditInit: Exiting\n\n");
- Thread.sleep(interruptRecoveryTime);
-
- }
-
- /*
- * This method initializes and cleans the DB so that PDP-D will be able to
- * store IntegrityAuditEntity in the DB.
- */
- public static void initializeDb(){
-
- PolicyLogger.debug("initializeDb: Entering");
-
- Properties cleanProperties = new Properties();
- cleanProperties.put(DroolsPersistenceProperties.DB_DRIVER,"org.h2.Driver");
- cleanProperties.put(DroolsPersistenceProperties.DB_URL, "jdbc:h2:file:./sql/drools");
- cleanProperties.put(DroolsPersistenceProperties.DB_USER, "sa");
- cleanProperties.put(DroolsPersistenceProperties.DB_PWD, "");
- //EntityManagerFactory emf = Persistence.createEntityManagerFactory("schemaPU", cleanProperties);
- EntityManagerFactory emf = Persistence.createEntityManagerFactory("junitDroolsPU", cleanProperties);
-
- EntityManager em = emf.createEntityManager();
- // Start a transaction
- EntityTransaction et = em.getTransaction();
-
- et.begin();
-
- // Clean up the DB
- em.createQuery("Delete from IntegrityAuditEntity").executeUpdate();
-
- // commit transaction
- et.commit();
- em.close();
-
- PolicyLogger.debug("initializeDb: Exiting");
- }
-
- private class PolicyManagementRunner extends Thread {
-
- public void run() {
- PolicyLogger.info("PolicyManagementRunner.run: Entering");
- String args[] = { "src/main/server/config" };
- try {
- Main.main(args);
- } catch (Exception e) {
- PolicyLogger
- .info("PolicyManagementRunner.run: Exception thrown from Main.main(), message="
- + e.getMessage());
- }
- PolicyLogger.info("PolicyManagementRunner.run: Exiting");
- }
-
- public void stopRunner() {
- PolicyEngine.manager.shutdown();
- }
-
- }
-
-}
diff --git a/policy-persistence/src/test/java/org/openecomp/policy/drools/controller/test/StandbyStateManagementTest.java b/policy-persistence/src/test/java/org/openecomp/policy/drools/controller/test/StandbyStateManagementTest.java
deleted file mode 100644
index b7c3d55..0000000
--- a/policy-persistence/src/test/java/org/openecomp/policy/drools/controller/test/StandbyStateManagementTest.java
+++ /dev/null
@@ -1,1406 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * policy-persistence
- * ================================================================================
- * Copyright (C) 2017 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.openecomp.policy.drools.controller.test;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.Properties;
-
-import javax.persistence.EntityManager;
-import javax.persistence.EntityManagerFactory;
-import javax.persistence.EntityTransaction;
-import javax.persistence.Persistence;
-
-import org.apache.commons.lang3.time.DateUtils;
-import org.junit.After;
-import org.junit.AfterClass;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Ignore;
-import org.junit.Test;
-import org.openecomp.policy.common.im.AdministrativeStateException;
-import org.openecomp.policy.common.im.IntegrityMonitor;
-import org.openecomp.policy.common.im.StandbyStatusException;
-import org.openecomp.policy.common.im.StateManagement;
-import org.openecomp.policy.common.logging.flexlogger.FlexLogger;
-import org.openecomp.policy.common.logging.flexlogger.Logger;
-import org.openecomp.policy.drools.core.DroolsPDPIntegrityMonitor;
-import org.openecomp.policy.drools.core.IntegrityMonitorProperties;
-import org.openecomp.policy.drools.core.PolicyContainer;
-import org.openecomp.policy.drools.im.PMStandbyStateChangeNotifier;
-import org.openecomp.policy.drools.persistence.DroolsPdp;
-import org.openecomp.policy.drools.persistence.DroolsPdpEntity;
-import org.openecomp.policy.drools.persistence.DroolsPdpImpl;
-import org.openecomp.policy.drools.persistence.DroolsPdpsConnector;
-import org.openecomp.policy.drools.persistence.DroolsPdpsElectionHandler;
-import org.openecomp.policy.drools.persistence.DroolsPersistenceProperties;
-import org.openecomp.policy.drools.persistence.JpaDroolsPdpsConnector;
-import org.openecomp.policy.drools.persistence.XacmlPersistenceProperties;
-import org.openecomp.policy.drools.system.Main;
-
-/*
- * All JUnits are designed to run in the local development environment
- * where they have write privileges and can execute time-sensitive
- * tasks.
- *
- * These tests can be run as JUnits, but there is some issue with running them
- * as part of a "mvn install" build. Also, they take a very long time to run
- * due to many real time breaks. Consequently, they are marked as @Ignore and
- * only run from the desktop.
- *
- */
-public class StandbyStateManagementTest {
- private static Logger logger = FlexLogger.getLogger(StandbyStateManagementTest.class);
- /*
- * Currently, the DroolsPdpsElectionHandler.DesignationWaiter is invoked every ten seconds, starting
- * at ten seconds after the minute boundary (e.g. 13:05:10). So, an 80 second sleep should be
- * sufficient to ensure that we wait for the DesignationWaiter to do its job, before
- * checking the results.
- */
- long sleepTime = 80000;
-
- /*
- * DroolsPdpsElectionHandler runs every ten seconds, so a 15 second sleep should be
- * plenty to ensure it has time to re-promote this PDP.
- */
- long electionWaitSleepTime = 15000;
-
- /*
- * Sleep 5 seconds after each test to allow interrupt (shutdown) recovery.
- */
- long interruptRecoveryTime = 5000;
-
- private static EntityManagerFactory emfx;
- private static EntityManagerFactory emfd;
- private static EntityManager emx;
- private static EntityManager emd;
- private static EntityTransaction et;
-
- /*
- * See the IntegrityMonitor.getJmxUrl() method for the rationale behind this jmx related processing.
- */
- @BeforeClass
- public static void setUpClass() throws Exception {
-
- String userDir = System.getProperty("user.dir");
- logger.debug("setUpClass: userDir=" + userDir);
- System.setProperty("com.sun.management.jmxremote.port", "9980");
- System.setProperty("com.sun.management.jmxremote.authenticate","false");
-
- // Make sure path to config directory is set correctly in PolicyContainer.main
- // Also make sure we ignore HTTP server failures resulting from port conflicts.
- PolicyContainer.isUnitTesting = true;
-
- }
-
- @AfterClass
- public static void tearDownClass() throws Exception {
- }
-
- @Before
- public void setUp() throws Exception {
- //Create teh data access for xaml db
- Properties xacmlPersistenceProperties = new Properties();
- xacmlPersistenceProperties.load(new FileInputStream(new File(
- "src/test/server/config/xacmlPersistence.properties")));
-
- emfx = Persistence.createEntityManagerFactory("junitXacmlPU", xacmlPersistenceProperties);
-
- // Create an entity manager to use the DB
- emx = emfx.createEntityManager();
-
- //Create the data access for drools db
- Properties droolsPersistenceProperties = new Properties();
- droolsPersistenceProperties.load(new FileInputStream(new File(
- "src/test/server/config/droolsPersistence.properties")));
-
- emfd = Persistence.createEntityManagerFactory("junitDroolsPU", droolsPersistenceProperties);
-
- // Create an entity manager to use the DB
- emd = emfd.createEntityManager();
- }
-
- @After
- public void tearDown() throws Exception {
-
- }
-
- public void cleanXacmlDb(){
- et = emx.getTransaction();
-
- et.begin();
- // Make sure we leave the DB clean
- emx.createQuery("DELETE FROM StateManagementEntity").executeUpdate();
- emx.createQuery("DELETE FROM ResourceRegistrationEntity").executeUpdate();
- emx.createQuery("DELETE FROM ForwardProgressEntity").executeUpdate();
- emx.createQuery("DELETE FROM IntegrityAuditEntity").executeUpdate();
- emx.flush();
- et.commit();
- }
-
- public void cleanDroolsDb(){
- et = emd.getTransaction();
-
- et.begin();
- // Make sure we leave the DB clean
- emd.createQuery("DELETE FROM DroolsPdpEntity").executeUpdate();
- emd.createQuery("DELETE FROM DroolsSessionEntity").executeUpdate();
- emd.createQuery("DELETE FROM SessionInfo").executeUpdate();
- emd.createQuery("DELETE FROM WorkItemInfo").executeUpdate();
- emd.createQuery("DELETE FROM IntegrityAuditEntity").executeUpdate();
- emd.flush();
- et.commit();
- }
-
- /*
- * These JUnit tests must be run in an eclipse environment by right-clicking
- * StandbyStateManagementTest and selecting "Run As" -> "JUnit Test". If you
- * run them as part of mvn install, they will fail with an error "JUnit The
- * forked VM terminated without saying properly goodbye"
- */
- @Ignore
- @Test
- public void runAllTests() throws Exception {
- //testColdStandby();
- //testHotStandby1();
- //testHotStandby2();
- //testLocking1();
- //testLocking2();
- //testSanitizeDesignatedList();
- //testComputeMostRecentPrimary();
- //testComputeDesignatedPdp();
- testPMStandbyStateChangeNotifier();
- }
-
- private void testPMStandbyStateChangeNotifier() throws Exception {
- logger.debug("\n\ntestPMStandbyStateChangeNotifier: Entering\n\n");
- cleanXacmlDb();
-
- logger.debug("testPMStandbyStateChangeNotifier: Reading IntegrityMonitorProperties");
-
- Properties integrityMonitorProperties = new Properties();
- integrityMonitorProperties.load(new FileInputStream(new File(
- "src/test/server/config/IntegrityMonitor.properties")));
- IntegrityMonitorProperties.initProperties(integrityMonitorProperties);
-
- logger.debug("testPMStandbyStateChangeNotifier: Reading droolsPersistenceProperties");
- Properties droolsPersistenceProperties = new Properties();
- droolsPersistenceProperties.load(new FileInputStream(new File(
- "src/test/server/config/droolsPersistence.properties")));
- DroolsPersistenceProperties.initProperties(droolsPersistenceProperties);
-
- logger.debug("testPMStandbyStateChangeNotifier: Reading xacmlPersistenceProperties");
-
- Properties xacmlPersistenceProperties = new Properties();
- xacmlPersistenceProperties.load(new FileInputStream(new File(
- "src/test/server/config/xacmlPersistence.properties")));
- XacmlPersistenceProperties.initProperties(xacmlPersistenceProperties);
-
- logger.debug("testPMStandbyStateChangeNotifier: Creating emfXacml");
- EntityManagerFactory emfXacml = Persistence.createEntityManagerFactory(
- "junitXacmlPU", xacmlPersistenceProperties);
-
- //Now get the StateManagement instance so we can register our observer
- StateManagement sm = new StateManagement(emfXacml, "pdp1");
-
- //Create an instance of the Observer
- PMStandbyStateChangeNotifier pmNotifier = new PMStandbyStateChangeNotifier();
-
- //Register the PMStandbyStateChangeNotifier Observer
- sm.addObserver(pmNotifier);
-
- //At this point the standbystatus = 'null'
- sm.lock();
- assertTrue(pmNotifier.getPreviousStandbyStatus().equals(StateManagement.NULL_VALUE));
-
- sm.unlock();
- assertTrue(pmNotifier.getPreviousStandbyStatus().equals(StateManagement.NULL_VALUE));
-
- //Adding standbystatus=hotstandby
- sm.demote();
- System.out.println(pmNotifier.getPreviousStandbyStatus());
- assertTrue(pmNotifier.getPreviousStandbyStatus().equals(PMStandbyStateChangeNotifier.HOTSTANDBY_OR_COLDSTANDBY));
-
- //Now making standbystatus=coldstandby
- sm.lock();
- assertTrue(pmNotifier.getPreviousStandbyStatus().equals(PMStandbyStateChangeNotifier.HOTSTANDBY_OR_COLDSTANDBY));
-
- //standbystatus = hotstandby
- sm.unlock();
- assertTrue(pmNotifier.getPreviousStandbyStatus().equals(PMStandbyStateChangeNotifier.HOTSTANDBY_OR_COLDSTANDBY));
-
- //standbystatus = providingservice
- sm.promote();
- //The previousStandbyStatus is not updated until after the delay activation expires
- assertTrue(pmNotifier.getPreviousStandbyStatus().equals(PMStandbyStateChangeNotifier.HOTSTANDBY_OR_COLDSTANDBY));
-
- //Sleep long enough for the delayActivationTimer to run
- Thread.sleep(5000);
- assertTrue(pmNotifier.getPreviousStandbyStatus().equals(StateManagement.PROVIDING_SERVICE));
-
- //standbystatus = providingservice
- sm.promote();
- assertTrue(pmNotifier.getPreviousStandbyStatus().equals(StateManagement.PROVIDING_SERVICE));
-
- //standbystatus = coldstandby
- sm.lock();
- assertTrue(pmNotifier.getPreviousStandbyStatus().equals(PMStandbyStateChangeNotifier.HOTSTANDBY_OR_COLDSTANDBY));
-
- //standbystatus = hotstandby
- sm.unlock();
- assertTrue(pmNotifier.getPreviousStandbyStatus().equals(PMStandbyStateChangeNotifier.HOTSTANDBY_OR_COLDSTANDBY));
-
- //standbystatus = hotstandby
- sm.demote();
- assertTrue(pmNotifier.getPreviousStandbyStatus().equals(PMStandbyStateChangeNotifier.HOTSTANDBY_OR_COLDSTANDBY));
-
- }
-
-
- //@Ignore
- //@Test
- public void testSanitizeDesignatedList() throws Exception {
-
- logger.debug("\n\ntestSanitizeDesignatedList: Entering\n\n");
-
- /*
- * Get a DroolsPdpsConnector
- */
- logger.debug("testSanitizeDesignatedList: Reading droolsPersistenceProperties");
- Properties droolsPersistenceProperties = new Properties();
- droolsPersistenceProperties.load(new FileInputStream(new File(
- "src/test/server/config/droolsPersistence.properties")));
- DroolsPersistenceProperties.initProperties(droolsPersistenceProperties);
-
- logger.debug("testSanitizeDesignatedList: Creating emfDrools");
- EntityManagerFactory emfDrools = Persistence.createEntityManagerFactory(
- "junitDroolsPU", droolsPersistenceProperties);
-
- DroolsPdpsConnector droolsPdpsConnector = new JpaDroolsPdpsConnector(emfDrools);
-
- /*
- * Create 4 pdpd all not designated
- */
- DroolsPdp pdp1 = new DroolsPdpImpl("pdp1", false, 4, new Date());
- DroolsPdp pdp2 = new DroolsPdpImpl("pdp2", false, 4, new Date());
- DroolsPdp pdp3 = new DroolsPdpImpl("pdp3", false, 4, new Date());
- DroolsPdp pdp4 = new DroolsPdpImpl("pdp4", false, 4, new Date());
-
- ArrayList<DroolsPdp> listOfDesignated = new ArrayList<DroolsPdp>();
- listOfDesignated.add(pdp1);
- listOfDesignated.add(pdp2);
- listOfDesignated.add(pdp3);
- listOfDesignated.add(pdp4);
-
- DroolsPDPIntegrityMonitor droolsPDPIntegrityMonitor;
- try{
- droolsPDPIntegrityMonitor = DroolsPDPIntegrityMonitor.init("src/test/server/config");
- }catch(Exception e){
- //If it already exists, just get it
- droolsPDPIntegrityMonitor = DroolsPDPIntegrityMonitor.getInstance();
- }
- DroolsPdpsElectionHandler droolsPdpsElectionHandler = new DroolsPdpsElectionHandler(droolsPdpsConnector, pdp1, droolsPDPIntegrityMonitor);
-
- listOfDesignated = droolsPdpsElectionHandler.santizeDesignatedList(listOfDesignated);
-
- logger.debug("\n\ntestSanitizeDesignatedList: listOfDesignated.size = " + listOfDesignated.size() + "\n\n");
-
- assertTrue(listOfDesignated.size()==4);
-
- /*
- * Now make 2 designated
- */
- pdp1.setDesignated(true);
- pdp2.setDesignated(true);
-
- listOfDesignated = droolsPdpsElectionHandler.santizeDesignatedList(listOfDesignated);
-
- logger.debug("\n\ntestSanitizeDesignatedList: listOfDesignated.size after 2 designated = " + listOfDesignated.size() + "\n\n");
-
- assertTrue(listOfDesignated.size()==2);
- assertTrue(listOfDesignated.contains(pdp1));
- assertTrue(listOfDesignated.contains(pdp2));
-
- /*
- * Now all are designated. But, we have to add back the previously non-designated nodes
- */
- pdp3.setDesignated(true);
- pdp4.setDesignated(true);
- listOfDesignated.add(pdp3);
- listOfDesignated.add(pdp4);
-
- listOfDesignated = droolsPdpsElectionHandler.santizeDesignatedList(listOfDesignated);
-
- logger.debug("\n\ntestSanitizeDesignatedList: listOfDesignated.size after all designated = " + listOfDesignated.size() + "\n\n");
-
- assertTrue(listOfDesignated.size()==4);
-
- }
-
- //@Ignore
- //@Test
- public void testComputeMostRecentPrimary() throws Exception {
-
- logger.debug("\n\ntestComputeMostRecentPrimary: Entering\n\n");
-
- /*
- * Get a DroolsPdpsConnector
- */
- logger.debug("testComputeMostRecentPrimary: Reading droolsPersistenceProperties");
- Properties droolsPersistenceProperties = new Properties();
- droolsPersistenceProperties.load(new FileInputStream(new File(
- "src/test/server/config/droolsPersistence.properties")));
- DroolsPersistenceProperties.initProperties(droolsPersistenceProperties);
-
- logger.debug("testComputeMostRecentPrimary: Creating emfDrools");
- EntityManagerFactory emfDrools = Persistence.createEntityManagerFactory(
- "junitDroolsPU", droolsPersistenceProperties);
-
- DroolsPdpsConnector droolsPdpsConnector = new JpaDroolsPdpsConnector(emfDrools);
-
- /*
- * Create 4 pdpd all not designated
- */
- long designatedDateMS = new Date().getTime();
- DroolsPdp pdp1 = new DroolsPdpImpl("pdp1", false, 4, new Date());
- pdp1.setDesignatedDate(new Date(designatedDateMS - 2));
-
- DroolsPdp pdp2 = new DroolsPdpImpl("pdp2", false, 4, new Date());
- //oldest
- pdp2.setDesignatedDate(new Date(designatedDateMS - 3));
-
- DroolsPdp pdp3 = new DroolsPdpImpl("pdp3", false, 4, new Date());
- pdp3.setDesignatedDate(new Date(designatedDateMS - 1));
-
- DroolsPdp pdp4 = new DroolsPdpImpl("pdp4", false, 4, new Date());
- //most recent
- pdp4.setDesignatedDate(new Date(designatedDateMS));
-
- ArrayList<DroolsPdp> listOfAllPdps = new ArrayList<DroolsPdp>();
- listOfAllPdps.add(pdp1);
- listOfAllPdps.add(pdp2);
- listOfAllPdps.add(pdp3);
- listOfAllPdps.add(pdp4);
-
-
- ArrayList<DroolsPdp> listOfDesignated = new ArrayList<DroolsPdp>();
- listOfDesignated.add(pdp1);
- listOfDesignated.add(pdp2);
- listOfDesignated.add(pdp3);
- listOfDesignated.add(pdp4);
-
-
- /*
- * Because the way we sanitize the listOfDesignated, it will always contain all hot standby
- * or all designated members.
- */
- DroolsPDPIntegrityMonitor droolsPDPIntegrityMonitor;
- try{
- droolsPDPIntegrityMonitor = DroolsPDPIntegrityMonitor.init("src/test/server/config");
- }catch(Exception e){
- //If it already exists, just get it
- droolsPDPIntegrityMonitor = DroolsPDPIntegrityMonitor.getInstance();
- }
- DroolsPdpsElectionHandler droolsPdpsElectionHandler = new DroolsPdpsElectionHandler(droolsPdpsConnector, pdp1, droolsPDPIntegrityMonitor);
-
- DroolsPdp mostRecentPrimary = droolsPdpsElectionHandler.computeMostRecentPrimary(listOfAllPdps, listOfDesignated);
-
- logger.debug("\n\ntestComputeMostRecentPrimary: mostRecentPrimary.getPdpId() = " + mostRecentPrimary.getPdpId() + "\n\n");
-
- /*
- * If all of the pdps are included in the listOfDesignated and none are designated, it will choose
- * the one which has the most recent designated date.
- */
- assertTrue(mostRecentPrimary.getPdpId().equals("pdp4"));
-
- /*
- * Now let's designate all of those on the listOfDesignated. It will choose the first one designated
- */
- pdp1.setDesignated(true);
- pdp2.setDesignated(true);
- pdp3.setDesignated(true);
- pdp4.setDesignated(true);
-
- mostRecentPrimary = droolsPdpsElectionHandler.computeMostRecentPrimary(listOfAllPdps, listOfDesignated);
-
- logger.debug("\n\ntestComputeMostRecentPrimary: All designated all on list, mostRecentPrimary.getPdpId() = " + mostRecentPrimary.getPdpId() + "\n\n");
-
- /*
- * If all of the pdps are included in the listOfDesignated and all are designated, it will choose
- * the one which was designated first
- */
- assertTrue(mostRecentPrimary.getPdpId().equals("pdp2"));
-
- /*
- * Now we will designate only 2 and put just them in the listOfDesignated. The algorithm will now
- * look for the most recently designated pdp which is not currently designated.
- */
- pdp3.setDesignated(false);
- pdp4.setDesignated(false);
-
- listOfDesignated.remove(pdp3);
- listOfDesignated.remove(pdp4);
-
- mostRecentPrimary = droolsPdpsElectionHandler.computeMostRecentPrimary(listOfAllPdps, listOfDesignated);
-
- logger.debug("\n\ntestComputeMostRecentPrimary: mostRecentPrimary.getPdpId() = " + mostRecentPrimary.getPdpId() + "\n\n");
-
- assertTrue(mostRecentPrimary.getPdpId().equals("pdp4"));
-
-
- /*
- * Now we will have none designated and put two of them in the listOfDesignated. The algorithm will now
- * look for the most recently designated pdp regardless of whether it is currently marked as designated.
- */
- pdp1.setDesignated(false);
- pdp2.setDesignated(false);
-
- mostRecentPrimary = droolsPdpsElectionHandler.computeMostRecentPrimary(listOfAllPdps, listOfDesignated);
-
- logger.debug("\n\ntestComputeMostRecentPrimary: 2 on list mostRecentPrimary.getPdpId() = " + mostRecentPrimary.getPdpId() + "\n\n");
-
- assertTrue(mostRecentPrimary.getPdpId().equals("pdp4"));
-
- /*
- * If we have only one pdp on in the listOfDesignated, the most recently designated pdp will be chosen, regardless
- * of its designation status
- */
- listOfDesignated.remove(pdp1);
-
- mostRecentPrimary = droolsPdpsElectionHandler.computeMostRecentPrimary(listOfAllPdps, listOfDesignated);
-
- logger.debug("\n\ntestComputeMostRecentPrimary: 1 on list mostRecentPrimary.getPdpId() = " + mostRecentPrimary.getPdpId() + "\n\n");
-
- assertTrue(mostRecentPrimary.getPdpId().equals("pdp4"));
-
- /*
- * Finally, if none are on the listOfDesignated, it will again choose the most recently designated pdp.
- */
- listOfDesignated.remove(pdp2);
-
- mostRecentPrimary = droolsPdpsElectionHandler.computeMostRecentPrimary(listOfAllPdps, listOfDesignated);
-
- logger.debug("\n\ntestComputeMostRecentPrimary: 0 on list mostRecentPrimary.getPdpId() = " + mostRecentPrimary.getPdpId() + "\n\n");
-
- assertTrue(mostRecentPrimary.getPdpId().equals("pdp4"));
-
- }
-
- //@Ignore
- //@Test
- public void testComputeDesignatedPdp() throws Exception{
-
- logger.debug("\n\ntestComputeDesignatedPdp: Entering\n\n");
-
- /*
- * Get a DroolsPdpsConnector
- */
- logger.debug("testComputeDesignatedPdp: Reading droolsPersistenceProperties");
- Properties droolsPersistenceProperties = new Properties();
- droolsPersistenceProperties.load(new FileInputStream(new File(
- "src/test/server/config/droolsPersistence.properties")));
- DroolsPersistenceProperties.initProperties(droolsPersistenceProperties);
-
- logger.debug("testComputeDesignatedPdp: Creating emfDrools");
- EntityManagerFactory emfDrools = Persistence.createEntityManagerFactory(
- "junitDroolsPU", droolsPersistenceProperties);
-
- DroolsPdpsConnector droolsPdpsConnector = new JpaDroolsPdpsConnector(emfDrools);
-
- /*
- * Create 4 pdpd all not designated. Two on site1. Two on site2
- */
- long designatedDateMS = new Date().getTime();
- DroolsPdp pdp1 = new DroolsPdpImpl("pdp1", false, 4, new Date());
- pdp1.setDesignatedDate(new Date(designatedDateMS - 2));
- pdp1.setSiteName("site1");
-
- DroolsPdp pdp2 = new DroolsPdpImpl("pdp2", false, 4, new Date());
- pdp2.setDesignatedDate(new Date(designatedDateMS - 3));
- pdp2.setSiteName("site1");
-
- //oldest
- DroolsPdp pdp3 = new DroolsPdpImpl("pdp3", false, 4, new Date());
- pdp3.setDesignatedDate(new Date(designatedDateMS - 4));
- pdp3.setSiteName("site2");
-
- DroolsPdp pdp4 = new DroolsPdpImpl("pdp4", false, 4, new Date());
- //most recent
- pdp4.setDesignatedDate(new Date(designatedDateMS));
- pdp4.setSiteName("site2");
-
- ArrayList<DroolsPdp> listOfAllPdps = new ArrayList<DroolsPdp>();
- listOfAllPdps.add(pdp1);
- listOfAllPdps.add(pdp2);
- listOfAllPdps.add(pdp3);
- listOfAllPdps.add(pdp4);
-
-
- ArrayList<DroolsPdp> listOfDesignated = new ArrayList<DroolsPdp>();
-
- /*
- * We will first test an empty listOfDesignated. As we know from the previous JUnit,
- * the pdp with the most designated date will be chosen for mostRecentPrimary
- */
-
- DroolsPDPIntegrityMonitor droolsPDPIntegrityMonitor;
- try{
- droolsPDPIntegrityMonitor = DroolsPDPIntegrityMonitor.init("src/test/server/config");
- }catch(Exception e){
- //If it already exists, just get it
- droolsPDPIntegrityMonitor = DroolsPDPIntegrityMonitor.getInstance();
- }
- DroolsPdpsElectionHandler droolsPdpsElectionHandler = new DroolsPdpsElectionHandler(droolsPdpsConnector, pdp1, droolsPDPIntegrityMonitor);
-
- DroolsPdp mostRecentPrimary = pdp4;
-
- DroolsPdp designatedPdp = droolsPdpsElectionHandler.computeDesignatedPdp(listOfDesignated, mostRecentPrimary);
-
- /*
- * The designatedPdp should be null
- */
- assertTrue(designatedPdp==null);
-
- /*
- * Now let's try having only one pdp in listOfDesignated, but not in the same site as the most recent primary
- */
-
- listOfDesignated.add(pdp2);
-
- designatedPdp = droolsPdpsElectionHandler.computeDesignatedPdp(listOfDesignated, mostRecentPrimary);
-
- /*
- * Now the designatedPdp should be the one and only selection in the listOfDesignated
- */
- assertTrue(designatedPdp.getPdpId().equals(pdp2.getPdpId()));
-
- /*
- * Now let's put 2 pdps in the listOfDesignated, neither in the same site as the mostRecentPrimary
- */
- listOfDesignated.add(pdp1);
-
- designatedPdp = droolsPdpsElectionHandler.computeDesignatedPdp(listOfDesignated, mostRecentPrimary);
-
- /*
- * The designatedPdp should now be the one with the lowest lexiographic score - pdp1
- */
- assertTrue(designatedPdp.getPdpId().equals(pdp1.getPdpId()));
-
- /*
- * Finally, we will have 2 pdps in the listOfDesignated, one in the same site with the mostRecentPrimary
- */
- listOfDesignated.remove(pdp1);
- listOfDesignated.add(pdp3);
-
- designatedPdp = droolsPdpsElectionHandler.computeDesignatedPdp(listOfDesignated, mostRecentPrimary);
-
- /*
- * The designatedPdp should now be the one on the same site as the mostRecentPrimary
- */
- assertTrue(designatedPdp.getPdpId().equals(pdp3.getPdpId()));
- }
-
-
- //@Ignore
- //@Test
- public void testColdStandby() throws Exception {
-
- logger.debug("\n\ntestColdStandby: Entering\n\n");
- cleanXacmlDb();
- cleanDroolsDb();
-
- logger.debug("testColdStandby: Reading IntegrityMonitorProperties");
- Properties integrityMonitorProperties = new Properties();
- integrityMonitorProperties.load(new FileInputStream(new File(
- "src/test/server/config/IntegrityMonitor.properties")));
- IntegrityMonitorProperties.initProperties(integrityMonitorProperties);
- String thisPdpId = IntegrityMonitorProperties
- .getProperty(IntegrityMonitorProperties.PDP_INSTANCE_ID);
-
- logger.debug("testColdStandby: Reading xacmlPersistenceProperties");
- Properties xacmlPersistenceProperties = new Properties();
- xacmlPersistenceProperties.load(new FileInputStream(new File(
- "src/test/server/config/xacmlPersistence.properties")));
- XacmlPersistenceProperties.initProperties(xacmlPersistenceProperties);
-
- logger.debug("testColdStandby: Creating emfXacml");
- EntityManagerFactory emfXacml = Persistence.createEntityManagerFactory(
- "junitXacmlPU", xacmlPersistenceProperties);
-
- logger.debug("testColdStandby: Reading droolsPersistenceProperties");
- Properties droolsPersistenceProperties = new Properties();
- droolsPersistenceProperties.load(new FileInputStream(new File(
- "src/test/server/config/droolsPersistence.properties")));
- DroolsPersistenceProperties.initProperties(droolsPersistenceProperties);
-
- logger.debug("testColdStandby: Creating emfDrools");
- EntityManagerFactory emfDrools = Persistence.createEntityManagerFactory(
- "junitDroolsPU", droolsPersistenceProperties);
-
- DroolsPdpsConnector conn = new JpaDroolsPdpsConnector(emfDrools);
-
- logger.debug("testColdStandby: Cleaning up tables");
- conn.deleteAllSessions();
- conn.deleteAllPdps();
-
- logger.debug("testColdStandby: Inserting PDP=" + thisPdpId + " as designated");
- DroolsPdp pdp = new DroolsPdpImpl(thisPdpId, true, 4, new Date());
- conn.insertPdp(pdp);
- DroolsPdpEntity droolsPdpEntity = conn.getPdp(thisPdpId);
- logger.debug("testColdStandby: After insertion, DESIGNATED="
- + droolsPdpEntity.isDesignated() + " for PDP=" + thisPdpId);
- assertTrue(droolsPdpEntity.isDesignated() == true);
-
- /*
- * When the Standby Status changes (from providingservice) to hotstandby
- * or coldstandby,the Active/Standby selection algorithm must stand down
- * if thePDP-D is currently the lead/active node and allow another PDP-D
- * to take over.
- *
- * It must also call lock on all engines in the engine management.
- *
- * Yes, this is kludgy, but we have a chicken and egg problem here: we
- * need a StateManagement object to invoke the
- * deleteAllStateManagementEntities method.
- */
- logger.debug("testColdStandby: Instantiating stateManagement object");
- StateManagement sm = new StateManagement(emfXacml, "dummy");
- sm.deleteAllStateManagementEntities();
- sm = new StateManagement(emfXacml, thisPdpId);
- PMStandbyStateChangeNotifier pmStandbyStateChangeNotifier = new PMStandbyStateChangeNotifier();
- sm.addObserver(pmStandbyStateChangeNotifier);
-
- // Artificially putting a PDP into service is really a two step process, 1)
- // inserting it as designated and 2) promoting it so that its standbyStatus
- // is providing service.
-
- logger.debug("testColdStandby: Running policy-management.Main class");
- PolicyManagementRunner policyManagementRunner = new PolicyManagementRunner();
- policyManagementRunner.start();
-
- logger.debug("testColdStandby: Runner started; Sleeping "
- + interruptRecoveryTime + "ms before promoting PDP="
- + thisPdpId);
- Thread.sleep(interruptRecoveryTime);
-
- logger.debug("testColdStandby: Promoting PDP=" + thisPdpId);
- sm.promote();
-
- String standbyStatus = sm.getStandbyStatus(thisPdpId);
- logger.debug("testColdStandby: Before locking, PDP=" + thisPdpId + " has standbyStatus="
- + standbyStatus);
-
- logger.debug("testColdStandby: Locking sm");
- sm.lock();
-
- Thread.sleep(interruptRecoveryTime);
- /*
- * Verify that the PDP is no longer designated.
- */
- droolsPdpEntity = conn.getPdp(thisPdpId);
- logger.debug("testColdStandby: After lock sm.lock() invoked, DESIGNATED="
- + droolsPdpEntity.isDesignated() + " for PDP=" + thisPdpId);
- assertTrue(droolsPdpEntity.isDesignated() == false);
-
- logger.debug("testColdStandby: Stopping policyManagementRunner");
- //policyManagementRunner.stopRunner();
-
- logger.debug("\n\ntestColdStandby: Exiting\n\n");
- Thread.sleep(interruptRecoveryTime);
-
- }
-
- /*
- * Tests hot standby when there is only one PDP.
- */
- //@Ignore
- //@Test
- public void testHotStandby1() throws Exception {
-
- logger.debug("\n\ntestHotStandby1: Entering\n\n");
- cleanXacmlDb();
- cleanDroolsDb();
-
- logger.debug("testHotStandby1: Reading IntegrityMonitorProperties");
- Properties integrityMonitorProperties = new Properties();
- integrityMonitorProperties.load(new FileInputStream(new File(
- "src/test/server/config/IntegrityMonitor.properties")));
- IntegrityMonitorProperties.initProperties(integrityMonitorProperties);
- String thisPdpId = IntegrityMonitorProperties
- .getProperty(IntegrityMonitorProperties.PDP_INSTANCE_ID);
-
- logger.debug("testHotStandby1: Reading xacmlPersistenceProperties");
- Properties xacmlPersistenceProperties = new Properties();
- xacmlPersistenceProperties.load(new FileInputStream(new File(
- "src/test/server/config/xacmlPersistence.properties")));
- XacmlPersistenceProperties.initProperties(xacmlPersistenceProperties);
-
- logger.debug("testHotStandby1: Creating emfXacml");
- EntityManagerFactory emfXacml = Persistence.createEntityManagerFactory(
- "junitXacmlPU", xacmlPersistenceProperties);
-
- logger.debug("testHotStandby1: Reading droolsPersistenceProperties");
- Properties droolsPersistenceProperties = new Properties();
- droolsPersistenceProperties.load(new FileInputStream(new File(
- "src/test/server/config/droolsPersistence.properties")));
- DroolsPersistenceProperties.initProperties(droolsPersistenceProperties);
-
- logger.debug("testHotStandby1: Creating emfDrools");
- EntityManagerFactory emfDrools = Persistence.createEntityManagerFactory(
- "junitDroolsPU", droolsPersistenceProperties);
-
- DroolsPdpsConnector conn = new JpaDroolsPdpsConnector(emfDrools);
-
- logger.debug("testHotStandby1: Cleaning up tables");
- conn.deleteAllSessions();
- conn.deleteAllPdps();
-
- /*
- * Insert this PDP as not designated. Initial standby state will be
- * either null or cold standby. Demoting should transit state to
- * hot standby.
- */
- logger.debug("testHotStandby1: Inserting PDP=" + thisPdpId + " as not designated");
- Date yesterday = DateUtils.addDays(new Date(), -1);
- DroolsPdpImpl pdp = new DroolsPdpImpl(thisPdpId, false, 4, yesterday);
- conn.insertPdp(pdp);
- DroolsPdpEntity droolsPdpEntity = conn.getPdp(thisPdpId);
- logger.debug("testHotStandby1: After insertion, PDP=" + thisPdpId + " has DESIGNATED="
- + droolsPdpEntity.isDesignated());
- assertTrue(droolsPdpEntity.isDesignated() == false);
-
- logger.debug("testHotStandby1: Instantiating stateManagement object");
- StateManagement sm = new StateManagement(emfXacml, "dummy");
- sm.deleteAllStateManagementEntities();
- sm = new StateManagement(emfXacml, thisPdpId);
- PMStandbyStateChangeNotifier pmStandbyStateChangeNotifier = new PMStandbyStateChangeNotifier();
- sm.addObserver(pmStandbyStateChangeNotifier);
-
- logger.debug("testHotStandby1: Demoting PDP=" + thisPdpId);
- // demoting should cause state to transit to hotstandby
- sm.demote();
-
- logger.debug("testHotStandby1: Running policy-management.Main class");
- PolicyManagementRunner policyManagementRunner = new PolicyManagementRunner();
- policyManagementRunner.start();
-
- logger.debug("testHotStandby1: Sleeping "
- + sleepTime
- + "ms, to allow JpaDroolsPdpsConnector time to check droolspdpentity table");
- Thread.sleep(sleepTime);
-
- /*
- * Verify that this formerly un-designated PDP in HOT_STANDBY is now designated and providing service.
- */
- droolsPdpEntity = conn.getPdp(thisPdpId);
- logger.debug("testHotStandby1: After sm.demote() invoked, DESIGNATED="
- + droolsPdpEntity.isDesignated() + " for PDP=" + thisPdpId);
- assertTrue(droolsPdpEntity.isDesignated() == true);
- String standbyStatus = sm.getStandbyStatus(thisPdpId);
- logger.debug("testHotStandby1: After demotion, PDP=" + thisPdpId + " has standbyStatus="
- + standbyStatus);
- assertTrue(standbyStatus != null && standbyStatus.equals(StateManagement.PROVIDING_SERVICE));
-
- logger.debug("testHotStandby1: Stopping policyManagementRunner");
- //policyManagementRunner.stopRunner();
-
- logger.debug("\n\ntestHotStandby1: Exiting\n\n");
- Thread.sleep(interruptRecoveryTime);
-
- }
-
- /*
- * Tests hot standby when two PDPs are involved.
- */
- //@Ignore
- //@Test
- public void testHotStandby2() throws Exception {
-
- logger.info("\n\ntestHotStandby2: Entering\n\n");
- cleanXacmlDb();
- cleanDroolsDb();
-
- logger.info("testHotStandby2: Reading IntegrityMonitorProperties");
- Properties integrityMonitorProperties = new Properties();
- integrityMonitorProperties.load(new FileInputStream(new File(
- "src/test/server/config/IntegrityMonitor.properties")));
- IntegrityMonitorProperties.initProperties(integrityMonitorProperties);
- String thisPdpId = IntegrityMonitorProperties
- .getProperty(IntegrityMonitorProperties.PDP_INSTANCE_ID);
-
- logger.info("testHotStandby2: Reading xacmlPersistenceProperties");
- Properties xacmlPersistenceProperties = new Properties();
- xacmlPersistenceProperties.load(new FileInputStream(new File(
- "src/test/server/config/xacmlPersistence.properties")));
- XacmlPersistenceProperties.initProperties(xacmlPersistenceProperties);
-
- logger.info("testHotStandby2: Creating emfXacml");
- EntityManagerFactory emfXacml = Persistence.createEntityManagerFactory(
- "junitXacmlPU", xacmlPersistenceProperties);
-
- logger.info("testHotStandby2: Reading droolsPersistenceProperties");
- Properties droolsPersistenceProperties = new Properties();
- droolsPersistenceProperties.load(new FileInputStream(new File(
- "src/test/server/config/droolsPersistence.properties")));
- DroolsPersistenceProperties.initProperties(droolsPersistenceProperties);
-
- logger.info("testHotStandby2: Creating emfDrools");
- EntityManagerFactory emfDrools = Persistence.createEntityManagerFactory(
- "junitDroolsPU", droolsPersistenceProperties);
-
- DroolsPdpsConnector conn = new JpaDroolsPdpsConnector(emfDrools);
-
- logger.info("testHotStandby2: Cleaning up tables");
- conn.deleteAllSessions();
- conn.deleteAllPdps();
-
- /*
- * Insert a PDP that's designated but not current.
- */
- String activePdpId = "pdp2";
- logger.info("testHotStandby2: Inserting PDP=" + activePdpId + " as stale, designated PDP");
- Date yesterday = DateUtils.addDays(new Date(), -1);
- DroolsPdp pdp = new DroolsPdpImpl(activePdpId, true, 4, yesterday);
- conn.insertPdp(pdp);
- DroolsPdpEntity droolsPdpEntity = conn.getPdp(activePdpId);
- logger.info("testHotStandby2: After insertion, PDP=" + activePdpId + ", which is not current, has DESIGNATED="
- + droolsPdpEntity.isDesignated());
- assertTrue(droolsPdpEntity.isDesignated() == true);
-
- /*
- * Promote the designated PDP.
- *
- * We have a chicken and egg problem here: we need a StateManagement
- * object to invoke the deleteAllStateManagementEntities method.
- */
- logger.info("testHotStandby2: Promoting PDP=" + activePdpId);
- StateManagement sm = new StateManagement(emfXacml, "dummy");
- sm.deleteAllStateManagementEntities();
- sm = new StateManagement(emfXacml, activePdpId);//pdp2
- PMStandbyStateChangeNotifier pmStandbyStateChangeNotifier = new PMStandbyStateChangeNotifier();
- sm.addObserver(pmStandbyStateChangeNotifier);
-
- // Artificially putting a PDP into service is really a two step process, 1)
- // inserting it as designated and 2) promoting it so that its standbyStatus
- // is providing service.
-
- /*
- * Insert this PDP as not designated. Initial standby state will be
- * either null or cold standby. Demoting should transit state to
- * hot standby.
- */
- logger.info("testHotStandby2: Inserting PDP=" + thisPdpId + " as not designated");
- pdp = new DroolsPdpImpl(thisPdpId, false, 4, yesterday);
- conn.insertPdp(pdp);
- droolsPdpEntity = conn.getPdp(thisPdpId);
- logger.info("testHotStandby2: After insertion, PDP=" + thisPdpId + " has DESIGNATED="
- + droolsPdpEntity.isDesignated());
- assertTrue(droolsPdpEntity.isDesignated() == false);
-
- logger.info("testHotStandby2: Demoting PDP=" + thisPdpId);//pdp1
- StateManagement sm2 = new StateManagement(emfXacml, thisPdpId);
- sm2.addObserver(pmStandbyStateChangeNotifier);
-
- logger.info("testHotStandby2: Running policy-management.Main class");
- PolicyManagementRunner policyManagementRunner = new PolicyManagementRunner(); //pdp1
- policyManagementRunner.start();
-
- logger.info("testHotStandby2: Runner started; Sleeping "
- + interruptRecoveryTime + "ms before promoting/demoting");
- Thread.sleep(interruptRecoveryTime);
-
- logger.info("testHotStandby2: Runner started; promoting PDP=" + activePdpId);//pdpd2xs
- //at this point, the newly created pdp will have set the state to disabled/failed/cold standby
- //because it is stale. So, it cannot be promoted. We need to call sm.enableNotFailed() so we
- //can promote it and demote the other pdp - else the other pdp will just spring back to providingservice
- sm.enableNotFailed();//pdp1
- sm.promote();
- String standbyStatus = sm.getStandbyStatus(activePdpId);
- logger.info("testHotStandby2: After promoting, PDP=" + activePdpId + " has standbyStatus="
- + standbyStatus);
-
- // demoting PDP should ensure that state transits to hotstandby
- logger.info("testHotStandby2: Runner started; demoting PDP=" + thisPdpId);
- sm2.demote();//pdp1
- standbyStatus = sm.getStandbyStatus(thisPdpId);
- logger.info("testHotStandby2: After demoting, PDP=" + thisPdpId + " has standbyStatus="
- + standbyStatus);
-
- logger.info("testHotStandby2: Sleeping "
- + sleepTime
- + "ms, to allow JpaDroolsPdpsConnector time to check droolspdpentity table");
- Thread.sleep(sleepTime);
-
- /*
- * Verify that this PDP, demoted to HOT_STANDBY, is now
- * re-designated and providing service.
- */
- droolsPdpEntity = conn.getPdp(thisPdpId);
- logger.info("testHotStandby2: After demoting PDP=" + activePdpId
- + ", DESIGNATED=" + droolsPdpEntity.isDesignated()
- + " for PDP=" + thisPdpId);
- assertTrue(droolsPdpEntity.isDesignated() == true);
- standbyStatus = sm2.getStandbyStatus(thisPdpId);
- logger.info("testHotStandby2: After demoting PDP=" + activePdpId
- + ", PDP=" + thisPdpId + " has standbyStatus=" + standbyStatus);
- assertTrue(standbyStatus != null
- && standbyStatus.equals(StateManagement.PROVIDING_SERVICE));
-
- logger.info("testHotStandby2: Stopping policyManagementRunner");
- //policyManagementRunner.stopRunner();
-
- logger.info("\n\ntestHotStandby2: Exiting\n\n");
- Thread.sleep(interruptRecoveryTime);
-
- }
-
- /*
- * 1) Inserts and designates this PDP, then verifies that startTransaction
- * is successful.
- *
- * 2) Demotes PDP, and verifies that because there is only one PDP, it will
- * be immediately re-promoted, thus allowing startTransaction to be
- * successful.
- *
- * 3) Locks PDP and verifies that startTransaction results in
- * AdministrativeStateException.
- *
- * 4) Unlocks PDP and verifies that startTransaction results in
- * StandbyStatusException.
- *
- * 5) Promotes PDP and verifies that startTransaction is once again
- * successful.
- */
- //@Ignore
- //@Test
- public void testLocking1() throws Exception {
- logger.debug("testLocking1: Entry");
- cleanXacmlDb();
- cleanDroolsDb();
-
- logger.debug("testLocking1: Reading IntegrityMonitorProperties");
- Properties integrityMonitorProperties = new Properties();
- integrityMonitorProperties.load(new FileInputStream(new File(
- "src/test/server/config/IntegrityMonitor.properties")));
- IntegrityMonitorProperties.initProperties(integrityMonitorProperties);
- String thisPdpId = IntegrityMonitorProperties
- .getProperty(IntegrityMonitorProperties.PDP_INSTANCE_ID);
-
- logger.debug("testLocking1: Reading xacmlPersistenceProperties");
- Properties xacmlPersistenceProperties = new Properties();
- xacmlPersistenceProperties.load(new FileInputStream(new File(
- "src/test/server/config/xacmlPersistence.properties")));
- XacmlPersistenceProperties.initProperties(xacmlPersistenceProperties);
-
- logger.debug("testLocking1: Creating emfXacml");
- EntityManagerFactory emfXacml = Persistence.createEntityManagerFactory(
- "junitXacmlPU", xacmlPersistenceProperties);
-
- logger.debug("testLocking1: Reading droolsPersistenceProperties");
- Properties droolsPersistenceProperties = new Properties();
- droolsPersistenceProperties.load(new FileInputStream(new File(
- "src/test/server/config/droolsPersistence.properties")));
- DroolsPersistenceProperties.initProperties(droolsPersistenceProperties);
-
- logger.debug("testLocking1: Creating emfDrools");
- EntityManagerFactory emfDrools = Persistence.createEntityManagerFactory(
- "junitDroolsPU", droolsPersistenceProperties);
-
- DroolsPdpsConnector conn = new JpaDroolsPdpsConnector(emfDrools);
-
- logger.debug("testLocking1: Cleaning up tables");
- conn.deleteAllSessions();
- conn.deleteAllPdps();
-
- /*
- * Insert this PDP as designated. Initial standby state will be
- * either null or cold standby.
- */
- logger.debug("testLocking1: Inserting PDP=" + thisPdpId + " as designated");
- DroolsPdpImpl pdp = new DroolsPdpImpl(thisPdpId, true, 4, new Date());
- conn.insertPdp(pdp);
- DroolsPdpEntity droolsPdpEntity = conn.getPdp(thisPdpId);
- logger.debug("testLocking1: After insertion, PDP=" + thisPdpId + " has DESIGNATED="
- + droolsPdpEntity.isDesignated());
- assertTrue(droolsPdpEntity.isDesignated() == true);
-
- logger.debug("testLocking1: Instantiating stateManagement object");
- StateManagement sm = new StateManagement(emfXacml, "dummy");
- sm.deleteAllStateManagementEntities();
- sm = new StateManagement(emfXacml, thisPdpId);
- PMStandbyStateChangeNotifier pmStandbyStateChangeNotifier = new PMStandbyStateChangeNotifier();
- sm.addObserver(pmStandbyStateChangeNotifier);
-
- logger.debug("testLocking1: Running policy-management.Main class, designated="
- + conn.getPdp(thisPdpId).isDesignated());
- PolicyManagementRunner policyManagementRunner = new PolicyManagementRunner();
- policyManagementRunner.start();
-
- logger.debug("testLocking1: Runner started; Sleeping "
- + interruptRecoveryTime + "ms before promoting PDP="
- + thisPdpId);
- Thread.sleep(interruptRecoveryTime);
-
- logger.debug("testLocking1: Promoting PDP=" + thisPdpId);
- sm.promote();
-
- logger.debug("testLocking1: Sleeping "
- + sleepTime
- + "ms, to allow time for policy-management.Main class to come up, designated="
- + conn.getPdp(thisPdpId).isDesignated());
- Thread.sleep(sleepTime);
-
- logger.debug("testLocking1: Waking up and invoking startTransaction on active PDP="
- + thisPdpId
- + ", designated="
- + conn.getPdp(thisPdpId).isDesignated());
- DroolsPDPIntegrityMonitor droolsPdpIntegrityMonitor = (DroolsPDPIntegrityMonitor) IntegrityMonitor
- .getInstance();
- try {
- droolsPdpIntegrityMonitor.startTransaction();
- droolsPdpIntegrityMonitor.endTransaction();
- logger.debug("testLocking1: As expected, transaction successful");
- } catch (AdministrativeStateException e) {
- logger.error("testLocking1: Unexpectedly caught AdministrativeStateException, message=" + e.getMessage());
- assertTrue(false);
- } catch (StandbyStatusException e) {
- logger.error("testLocking1: Unexpectedly caught StandbyStatusException, message=" + e.getMessage());
- assertTrue(false);
- } catch (Exception e) {
- logger.error("testLocking1: Unexpectedly caught Exception, message=" + e.getMessage());
- assertTrue(false);
- }
-
- // demoting should cause state to transit to hotstandby, followed by re-promotion,
- // since there is only one PDP.
- logger.debug("testLocking1: demoting PDP=" + thisPdpId);
- sm = droolsPdpIntegrityMonitor.getStateManager();
- sm.demote();
-
- logger.debug("testLocking1: sleeping" + electionWaitSleepTime
- + " to allow election handler to re-promote PDP=" + thisPdpId);
- Thread.sleep(electionWaitSleepTime);
-
- logger.debug("testLocking1: Invoking startTransaction on re-promoted PDP="
- + thisPdpId
- + ", designated="
- + conn.getPdp(thisPdpId).isDesignated());
- try {
- droolsPdpIntegrityMonitor.startTransaction();
- droolsPdpIntegrityMonitor.endTransaction();
- logger.debug("testLocking1: As expected, transaction successful");
- } catch (AdministrativeStateException e) {
- logger.error("testLocking1: Unexpectedly caught AdministrativeStateException, message=" + e.getMessage());
- assertTrue(false);
- } catch (StandbyStatusException e) {
- logger.error("testLocking1: Unexpectedly caught StandbyStatusException, message=" + e.getMessage());
- assertTrue(false);
- } catch (Exception e) {
- logger.error("testLocking1: Unexpectedly caught Exception, message=" + e.getMessage());
- assertTrue(false);
- }
-
- // locking should cause state to transit to cold standby
- logger.debug("testLocking1: locking PDP=" + thisPdpId);
- sm.lock();
-
- // Just to avoid any race conditions, sleep a little after locking
- logger.debug("testLocking1: Sleeping a few millis after locking, to avoid race condition");
- Thread.sleep(100);
-
- logger.debug("testLocking1: Invoking startTransaction on locked PDP="
- + thisPdpId
- + ", designated="
- + conn.getPdp(thisPdpId).isDesignated());
- try {
- droolsPdpIntegrityMonitor.startTransaction();
- logger.error("testLocking1: startTransaction unexpectedly successful");
- assertTrue(false);
- } catch (AdministrativeStateException e) {
- logger.debug("testLocking1: As expected, caught AdministrativeStateException, message=" + e.getMessage());
- } catch (StandbyStatusException e) {
- logger.error("testLocking1: Unexpectedly caught StandbyStatusException, message=" + e.getMessage());
- assertTrue(false);
- } catch (Exception e) {
- logger.error("testLocking1: Unexpectedly caught Exception, message=" + e.getMessage());
- assertTrue(false);
- } finally {
- droolsPdpIntegrityMonitor.endTransaction();
- }
-
- // unlocking should cause state to transit to hot standby and then providing service
- logger.debug("testLocking1: unlocking PDP=" + thisPdpId);
- sm.unlock();
-
- // Just to avoid any race conditions, sleep a little after locking
- logger.debug("testLocking1: Sleeping a few millis after unlocking, to avoid race condition");
- Thread.sleep(electionWaitSleepTime);
-
- logger.debug("testLocking1: Invoking startTransaction on unlocked PDP="
- + thisPdpId
- + ", designated="
- + conn.getPdp(thisPdpId).isDesignated());
- try {
- droolsPdpIntegrityMonitor.startTransaction();
- logger.error("testLocking1: startTransaction successful as expected");
- } catch (AdministrativeStateException e) {
- logger.error("testLocking1: Unexpectedly caught AdministrativeStateException, message=" + e.getMessage());
- assertTrue(false);
- } catch (StandbyStatusException e) {
- logger.debug("testLocking1: Unexpectedly caught StandbyStatusException, message=" + e.getMessage());
- assertTrue(false);
- } catch (Exception e) {
- logger.error("testLocking1: Unexpectedly caught Exception, message=" + e.getMessage());
- assertTrue(false);
- } finally {
- droolsPdpIntegrityMonitor.endTransaction();
- }
-
- // demoting should cause state to transit to providing service
- logger.debug("testLocking1: demoting PDP=" + thisPdpId);
- sm.demote();
-
- // Just to avoid any race conditions, sleep a little after promoting
- logger.debug("testLocking1: Sleeping a few millis after demoting, to avoid race condition");
- Thread.sleep(100);
-
- logger.debug("testLocking1: Invoking startTransaction on demoted PDP="
- + thisPdpId
- + ", designated="
- + conn.getPdp(thisPdpId).isDesignated());
- try {
- droolsPdpIntegrityMonitor.startTransaction();
- droolsPdpIntegrityMonitor.endTransaction();
- logger.debug("testLocking1: Unexpectedly, transaction successful");
- assertTrue(false);
- } catch (AdministrativeStateException e) {
- logger.error("testLocking1: Unexpectedly caught AdministrativeStateException, message=" + e.getMessage());
- assertTrue(false);
- } catch (StandbyStatusException e) {
- logger.error("testLocking1: As expected caught StandbyStatusException, message=" + e.getMessage());
- } catch (Exception e) {
- logger.error("testLocking1: Unexpectedly caught Exception, message=" + e.getMessage());
- assertTrue(false);
- }
-
- logger.debug("testLocking1: Stopping policyManagementRunner");
- //policyManagementRunner.stopRunner();
-
- logger.debug("\n\ntestLocking1: Exiting\n\n");
- Thread.sleep(interruptRecoveryTime);
-
- }
-
- /*
- * 1) Inserts and designates this PDP, then verifies that startTransaction
- * is successful.
- *
- * 2) Inserts another PDP in hotstandby.
- *
- * 3) Demotes this PDP, and verifies 1) that other PDP is not promoted (because one
- * PDP cannot promote another PDP) and 2) that this PDP is re-promoted.
- */
- //@Ignore
- //@Test
- public void testLocking2() throws Exception {
-
- logger.debug("\n\ntestLocking2: Entering\n\n");
- cleanXacmlDb();
- cleanDroolsDb();
-
- logger.debug("testLocking2: Reading IntegrityMonitorProperties");
- Properties integrityMonitorProperties = new Properties();
- integrityMonitorProperties.load(new FileInputStream(new File(
- "src/test/server/config/IntegrityMonitor.properties")));
- IntegrityMonitorProperties.initProperties(integrityMonitorProperties);
- String thisPdpId = IntegrityMonitorProperties
- .getProperty(IntegrityMonitorProperties.PDP_INSTANCE_ID);
-
- logger.debug("testLocking2: Reading xacmlPersistenceProperties");
- Properties xacmlPersistenceProperties = new Properties();
- xacmlPersistenceProperties.load(new FileInputStream(new File(
- "src/test/server/config/xacmlPersistence.properties")));
- XacmlPersistenceProperties.initProperties(xacmlPersistenceProperties);
-
- logger.debug("testLocking2: Creating emfXacml");
- EntityManagerFactory emfXacml = Persistence.createEntityManagerFactory(
- "junitXacmlPU", xacmlPersistenceProperties);
-
- logger.debug("testLocking2: Reading droolsPersistenceProperties");
- Properties droolsPersistenceProperties = new Properties();
- droolsPersistenceProperties.load(new FileInputStream(new File(
- "src/test/server/config/droolsPersistence.properties")));
- DroolsPersistenceProperties.initProperties(droolsPersistenceProperties);
-
- logger.debug("testLocking2: Creating emfDrools");
- EntityManagerFactory emfDrools = Persistence.createEntityManagerFactory(
- "junitDroolsPU", droolsPersistenceProperties);
-
- DroolsPdpsConnector conn = new JpaDroolsPdpsConnector(emfDrools);
-
- logger.debug("testLocking2: Cleaning up tables");
- conn.deleteAllSessions();
- conn.deleteAllPdps();
-
- /*
- * Insert this PDP as designated. Initial standby state will be
- * either null or cold standby. Demoting should transit state to
- * hot standby.
- */
- logger.debug("testLocking2: Inserting PDP=" + thisPdpId + " as designated");
- DroolsPdpImpl pdp = new DroolsPdpImpl(thisPdpId, true, 3, new Date());
- conn.insertPdp(pdp);
- DroolsPdpEntity droolsPdpEntity = conn.getPdp(thisPdpId);
- logger.debug("testLocking2: After insertion, PDP=" + thisPdpId + " has DESIGNATED="
- + droolsPdpEntity.isDesignated());
- assertTrue(droolsPdpEntity.isDesignated() == true);
-
- logger.debug("testLocking2: Instantiating stateManagement object and promoting PDP=" + thisPdpId);
- StateManagement sm = new StateManagement(emfXacml, "dummy");
- sm.deleteAllStateManagementEntities();
- sm = new StateManagement(emfXacml, thisPdpId);
- PMStandbyStateChangeNotifier pmStandbyStateChangeNotifier = new PMStandbyStateChangeNotifier();
- sm.addObserver(pmStandbyStateChangeNotifier);
-
- /*
- * Insert another PDP as not designated. Initial standby state will be
- * either null or cold standby. Demoting should transit state to
- * hot standby.
- */
- String standbyPdpId = "pdp2";
- logger.debug("testLocking2: Inserting PDP=" + standbyPdpId + " as not designated");
- Date yesterday = DateUtils.addDays(new Date(), -1);
- pdp = new DroolsPdpImpl(standbyPdpId, false, 4, yesterday);
- conn.insertPdp(pdp);
- droolsPdpEntity = conn.getPdp(standbyPdpId);
- logger.debug("testLocking2: After insertion, PDP=" + standbyPdpId + " has DESIGNATED="
- + droolsPdpEntity.isDesignated());
- assertTrue(droolsPdpEntity.isDesignated() == false);
-
- logger.debug("testLocking2: Demoting PDP=" + standbyPdpId);
- StateManagement sm2 = new StateManagement(emfXacml, standbyPdpId);
- sm2.addObserver(pmStandbyStateChangeNotifier);
-
- logger.debug("testLocking2: Running policy-management.Main class");
- PolicyManagementRunner policyManagementRunner = new PolicyManagementRunner();
- policyManagementRunner.start();
-
- logger.debug("testLocking2: Runner started; Sleeping "
- + interruptRecoveryTime + "ms before promoting/demoting");
- Thread.sleep(interruptRecoveryTime);
-
- logger.debug("testLocking2: Promoting PDP=" + thisPdpId);
- sm.promote();
-
- // demoting PDP should ensure that state transits to hotstandby
- logger.debug("testLocking2: Demoting PDP=" + standbyPdpId);
- sm2.demote();
-
- logger.debug("testLocking2: Sleeping "
- + sleepTime
- + "ms, to allow time for policy-management.Main class to come up");
- Thread.sleep(sleepTime);
-
- logger.debug("testLocking2: Waking up and invoking startTransaction on active PDP="
- + thisPdpId
- + ", designated="
- + conn.getPdp(thisPdpId).isDesignated());
- DroolsPDPIntegrityMonitor droolsPdpIntegrityMonitor = (DroolsPDPIntegrityMonitor) IntegrityMonitor
- .getInstance();
- try {
- droolsPdpIntegrityMonitor.startTransaction();
- droolsPdpIntegrityMonitor.endTransaction();
- logger.debug("testLocking2: As expected, transaction successful");
- } catch (AdministrativeStateException e) {
- logger.error("testLocking2: Unexpectedly caught AdministrativeStateException, message=" + e.getMessage());
- assertTrue(false);
- } catch (StandbyStatusException e) {
- logger.error("testLocking2: Unexpectedly caught StandbyStatusException, message=" + e.getMessage());
- assertTrue(false);
- } catch (Exception e) {
- logger.error("testLocking2: Unexpectedly caught Exception, message=" + e.getMessage());
- assertTrue(false);
- }
-
- // demoting should cause state to transit to hotstandby followed by re-promotion.
- logger.debug("testLocking2: demoting PDP=" + thisPdpId);
- sm = droolsPdpIntegrityMonitor.getStateManager();
- sm.demote();
-
- logger.debug("testLocking2: sleeping" + electionWaitSleepTime
- + " to allow election handler to re-promote PDP=" + thisPdpId);
- Thread.sleep(electionWaitSleepTime);
-
- logger.debug("testLocking2: Waking up and invoking startTransaction on re-promoted PDP="
- + thisPdpId + ", designated="
- + conn.getPdp(thisPdpId).isDesignated());
- try {
- droolsPdpIntegrityMonitor.startTransaction();
- droolsPdpIntegrityMonitor.endTransaction();
- logger.debug("testLocking2: As expected, transaction successful");
- } catch (AdministrativeStateException e) {
- logger.error("testLocking2: Unexpectedly caught AdministrativeStateException, message=" + e.getMessage());
- assertTrue(false);
- } catch (StandbyStatusException e) {
- logger.error("testLocking2: Unexpectedly caught StandbyStatusException, message=" + e.getMessage());
- assertTrue(false);
- } catch (Exception e) {
- logger.error("testLocking2: Unexpectedly caught Exception, message=" + e.getMessage());
- assertTrue(false);
- }
-
- logger.debug("testLocking2: Verifying designated status for PDP="
- + standbyPdpId);
- boolean standbyPdpDesignated = conn.getPdp(standbyPdpId).isDesignated();
- assertTrue(standbyPdpDesignated == false);
-
- logger.debug("testLocking2: Stopping policyManagementRunner");
- //policyManagementRunner.stopRunner();
-
- logger.debug("\n\ntestLocking2: Exiting\n\n");
- Thread.sleep(interruptRecoveryTime);
-
- }
-
-
- private class PolicyManagementRunner extends Thread {
-
- public void run() {
- logger.info("PolicyManagementRunner.run: Entering");
- String args[] = { "src/main/server/config" };
- try {
- Main.main(args);
- } catch (Exception e) {
- logger
- .info("PolicyManagementRunner.run: Exception thrown from Main.main(), message="
- + e.getMessage());
- return;
- }
- logger.info("PolicyManagementRunner.run: Exiting");
- }
-
- }
-
-}
diff --git a/policy-persistence/src/test/resources/IntegrityMonitor.properties b/policy-persistence/src/test/resources/IntegrityMonitor.properties
deleted file mode 100644
index 2d8676c..0000000
--- a/policy-persistence/src/test/resources/IntegrityMonitor.properties
+++ /dev/null
@@ -1,72 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-persistence
-# ================================================================================
-# Copyright (C) 2017 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=========================================================
-###
-
-#hostPort = ${{host_port}}
-hostPort = 0.0.0.0:9981
-
-# The following were added as part of US673632
-#
-# Forward Progress Monitor update interval seconds
-fp_monitor_interval = 30
-# Failed counter threshold before failover
-failed_counter_threshold = 3
-# Interval between test transactions when no traffic seconds
-test_trans_interval = 10
-# Interval between writes of the FPC to the DB seconds
-write_fpc_interval = 5
-# Name of the site in which this node is hosted
-site_name = pdp_1
-# Node type
-# Note: Make sure you don't leave any trailing spaces, or you'll get an 'invalid node type' error!
-node_type = pdp_drools
-# Dependency groups are groups of resources upon which a node operational state is dependent upon.
-# Each group is a comma-separated list of resource names and groups are separated by a semicolon. For example:
-#dependency_groups=site_1.astra_1,site_1.astra_2;site_1.brms_1,site_1.brms_2;site_1.logparser_1;site_1.pypdp_1
-#dependency_groups=${{dependency_groups}}
-dependency_groups=""
-# When set to true, dependent health checks are performed by using JMX to invoke test() on the dependent.
-# The default false is to use state checks for health.
-#test_via_jmx=${{test_via_jmx}}
-# This is the max number of seconds beyond which a non incrementing FPC is considered a failure
-#max_fpc_update_interval=${{max_fpc_update_interval}}
-
-# Needed by DroolsPdpsElectionHandler
-pdp.checkInterval=1500
-pdp.updateInterval=1000
-#pdp.timeout=3000
-# Need long timeout, because testTransaction is only run every 10 seconds.
-pdp.timeout=15000
-#how long do we wait for the pdp table to populate on initial startup
-pdp.initialWait=20000
-
-# Known as the PDPID in the droolpdpentity table.
-resource.name=pdp1
-#resource.name=${{resource_name}}
-
-# Flag to control the execution of the subsystemTest for the Database
-db.audit.is.active=false
-
-# Flag to control the execution of the subsystemTest for the Nexus Maven repository
-repository.audit.is.active=false
-repository.audit.ignore.errors=true
-
-# Run the state audit every 60 seconds. NOTE! It will only run on nodes that are providing service.
-state_audit_interval_ms=60000
-
diff --git a/policy-persistence/src/test/resources/META-INF/persistence.xml b/policy-persistence/src/test/resources/META-INF/persistence.xml
deleted file mode 100644
index ed8a8cd..0000000
--- a/policy-persistence/src/test/resources/META-INF/persistence.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============LICENSE_START=======================================================
- policy-persistence
- ================================================================================
- Copyright (C) 2017 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=========================================================
- -->
-
-<persistence version="2.1"
- xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
-
- <persistence-unit name="junitDroolsPU" transaction-type="RESOURCE_LOCAL">
- <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <class>org.openecomp.policy.drools.persistence.DroolsPdpEntity</class>
- <class>org.openecomp.policy.drools.persistence.DroolsSessionEntity</class>
- <!-- <class>org.openecomp.policy.drools.persistence.LastSiteEntity</class> -->
- <class>org.drools.persistence.info.SessionInfo</class>
- <class>org.drools.persistence.info.WorkItemInfo</class>
- <class>org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity</class>
- <properties>
- <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
- <property name="javax.persistence.schema-generation.scripts.action" value="drop-and-create"/>
- <property name="javax.persistence.schema-generation.scripts.create-target" value="./sql/generatedCreateDrools.ddl"/>
- <property name="javax.persistence.schema-generation.scripts.drop-target" value="./sql/generatedDropDrools.ddl"/>
- </properties>
- </persistence-unit>
-
- <persistence-unit name="junitXacmlPU" transaction-type="RESOURCE_LOCAL">
- <provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>
- <class>org.openecomp.policy.common.im.jpa.StateManagementEntity</class>
- <class>org.openecomp.policy.common.im.jpa.ForwardProgressEntity</class>
- <class>org.openecomp.policy.common.im.jpa.ResourceRegistrationEntity</class>
- <class>org.openecomp.policy.common.ia.jpa.IntegrityAuditEntity</class>
- <properties>
- <property name="javax.persistence.schema-generation.database.action" value="drop-and-create"/>
- <property name="javax.persistence.schema-generation.scripts.action" value="drop-and-create"/>
- <property name="javax.persistence.schema-generation.scripts.create-target" value="./sql/generatedCreateXacml.ddl"/>
- <property name="javax.persistence.schema-generation.scripts.drop-target" value="./sql/generatedDropXacml.ddl"/>
- </properties>
- </persistence-unit>
-
-</persistence>
diff --git a/policy-persistence/src/test/resources/droolsPersistence.properties b/policy-persistence/src/test/resources/droolsPersistence.properties
deleted file mode 100644
index 544e1c2..0000000
--- a/policy-persistence/src/test/resources/droolsPersistence.properties
+++ /dev/null
@@ -1,51 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-persistence
-# ================================================================================
-# Copyright (C) 2017 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=========================================================
-###
-
-javax.persistence.jdbc.driver = org.h2.Driver
-javax.persistence.jdbc.url = jdbc:h2:file:./sql/drools
-javax.persistence.jdbc.user = sa
-javax.persistence.jdbc.password =
-
-#javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver
-#javax.persistence.jdbc.url=jdbc:mariadb://localhost:3306/drools
-#javax.persistence.jdbc.user=root
-#javax.persistence.jdbc.password=policy
-
-#javax.persistence.jdbc.driver = ${{JDBC_DRIVER}}
-#javax.persistence.jdbc.url = ${{JDBC_DROOLS_URL}}
-#javax.persistence.jdbc.user = ${{JDBC_USER}}
-#javax.persistence.jdbc.password = ${{JDBC_PASSWORD}}
-
-# Needed?
-#javax.persistence.jdbc.driver = org.h2.Driver
-#javax.persistence.jdbc.url = jdbc:h2:file:./sql/ncomp
-#javax.persistence.jdbc.user = sa
-#javax.persistence.jdbc.password =
-#persistenceDisabled=false
-#javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver
-#javax.persistence.jdbc.url=jdbc:mariadb://192.168.56.30:3306/drools
-#javax.persistence.jdbc.user=patb
-#javax.persistence.jdbc.password=policy
-
-hibernate.dataSource=org.mariadb.jdbc.MySQLDataSource
-
-# For testing purposes, it may be convenient to disable persistence
-persistenceDisabled=false
-
diff --git a/policy-persistence/src/test/resources/log4j.properties b/policy-persistence/src/test/resources/log4j.properties
deleted file mode 100644
index 746d59a..0000000
--- a/policy-persistence/src/test/resources/log4j.properties
+++ /dev/null
@@ -1,31 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-persistence
-# ================================================================================
-# Copyright (C) 2017 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=========================================================
-###
-
-log4j.rootLogger=DEBUG, out
-log4j.logger.com.att=DEBUG
-log4j.logger.org.openecomp.policy.drools.system=DEBUG
-log4j.logger.org.openecomp.policy.drools.im=DEBUG
-log4j.logger.org.openecomp.policy.common.im=DEBUG
-log4j.logger.org.openecomp.policy.drools.event.comm=DEBUG
-
-# CONSOLE appender not used by default
-log4j.appender.out=org.apache.log4j.ConsoleAppender
-log4j.appender.out.layout=org.apache.log4j.PatternLayout
-log4j.appender.out.layout.ConversionPattern=%d %-5p %-30.30c{1} %4L - %m%n
diff --git a/policy-persistence/src/test/resources/logback.xml b/policy-persistence/src/test/resources/logback.xml
deleted file mode 100644
index 9fd83e8..0000000
--- a/policy-persistence/src/test/resources/logback.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<!--
- ============LICENSE_START=======================================================
- policy-persistence
- ================================================================================
- Copyright (C) 2017 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=========================================================
- -->
-
-<!-- Controls the output of logs for JUnit tests -->
-
-<configuration scan="true" scanPeriod="3 seconds" debug="true">
- <!--<jmxConfigurator /> -->
- <!-- directory path for all other type logs -->
- <property name="logDir" value="testingLogs" />
-
- <!-- directory path for debugging type logs -->
- <property name="debugDir" value="testingLogs" />
-
- <!-- specify the component name
- <ECOMP-component-name>::= "MSO" | "DCAE" | "ASDC " | "AAI" |"Policy" | "SDNC" | "AC" -->
- <property name="componentName" value="drools-pdp"></property>
- <property name="subComponentName" value="policy-management"></property>
-
- <!-- log file names -->
- <property name="errorLogName" value="error" />
- <property name="metricsLogName" value="metrics" />
- <property name="auditLogName" value="audit" />
- <property name="debugLogName" value="debug" />
-
- <property name="defaultPattern" value="%d{"yyyy-MM-dd'T'HH:mm:ss.SSSXXX", UTC}|%X{requestId}|%X{serviceInstanceId}|%t|%X{serverName}|%X{serviceName}|%X{instanceUuid}|%p|%X{severity}|%X{serverIpAddress}|%X{server}|%X{clientIpAddress}|%c||%msg%n" />
- <!-- <property name="defaultPattern" value="%d{"yyyy-MM-dd'T'HH:mm:ss.SSSXXX", UTC}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ServerFQDN}|%X{RemoteHost}||%X{Timer}|%msg%n" /> -->
- <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
- <property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
- <!--
- <property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
- <property name="debugLogDirectory" value="${debugDir}/${componentName}/${subComponentName}" />
- -->
- <!-- example from old log4j.properties: ${catalina.base}/logs/pdp-rest.log -->
-
- <!-- Example evaluator filter applied against console appender -->
- <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
- <encoder>
- <pattern>${defaultPattern}</pattern>
- </encoder>
- </appender>
-
- <!-- ============================================================================ -->
- <!-- EELF Appenders -->
- <!-- ============================================================================ -->
-
- <!-- The EELFAppender is used to record events to the general application
- log -->
-
-
-
-
- <!-- EELF Audit Appender. This appender is used to record audit engine
- related logging events. The audit logger and appender are specializations
- of the EELF application root logger and appender. This can be used to segregate
- Policy engine events from other components, or it can be eliminated to record
- these events as part of the application root log. -->
-
- <appender name="EELFAudit"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${logDirectory}/${auditLogName}.log</file>
- <rollingPolicy
- class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${logDirectory}/${auditLogName}.%i.log.zip
- </fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>9</maxIndex>
- </rollingPolicy>
- <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>5MB</maxFileSize>
- </triggeringPolicy>
- <encoder>
- <pattern>${defaultPattern}</pattern>
- </encoder>
- </appender>
- <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
- <queueSize>256</queueSize>
- <appender-ref ref="EELFAudit" />
- </appender>
-
-<appender name="EELFMetrics"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${logDirectory}/${metricsLogName}.log</file>
- <rollingPolicy
- class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${logDirectory}/${metricsLogName}.%i.log.zip
- </fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>9</maxIndex>
- </rollingPolicy>
- <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>5MB</maxFileSize>
- </triggeringPolicy>
- <encoder>
- <!-- <pattern>"%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} -
- %msg%n"</pattern> -->
- <pattern>${defaultPattern}</pattern>
- </encoder>
- </appender>
-
-
- <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
- <queueSize>256</queueSize>
- <appender-ref ref="EELFMetrics"/>
- </appender>
-
- <appender name="EELFError"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${logDirectory}/${errorLogName}.log</file>
- <rollingPolicy
- class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${logDirectory}/${errorLogName}.%i.log.zip
- </fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>9</maxIndex>
- </rollingPolicy>
- <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
- <level>ERROR</level>
- </filter>
- <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>5MB</maxFileSize>
- </triggeringPolicy>
- <encoder>
- <pattern>${defaultPattern}</pattern>
- </encoder>
- </appender>
-
- <appender name="asyncEELFError" class="ch.qos.logback.classic.AsyncAppender">
- <queueSize>256</queueSize>
- <appender-ref ref="EELFError"/>
- </appender>
-
- <appender name="EELFDebug"
- class="ch.qos.logback.core.rolling.RollingFileAppender">
- <file>${debugLogDirectory}/${debugLogName}.log</file>
- <rollingPolicy
- class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
- <fileNamePattern>${debugLogDirectory}/${debugLogName}.%i.log.zip
- </fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>9</maxIndex>
- </rollingPolicy>
- <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
- <!-- <level>INFO</level> -->
- <level>DEBUG</level>
- </filter>
- <triggeringPolicy
- class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>5MB</maxFileSize>
- </triggeringPolicy>
- <encoder>
- <pattern>${defaultPattern}</pattern>
- </encoder>
- </appender>
-
- <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
- <queueSize>256</queueSize>
- <appender-ref ref="EELFDebug" />
- <includeCallerData>true</includeCallerData>
- </appender>
-
-
- <!-- ============================================================================ -->
- <!-- EELF loggers -->
- <!-- ============================================================================ -->
-
- <logger name="com.att.eelf.audit" level="info" additivity="false">
- <appender-ref ref="asyncEELFAudit" />
- </logger>
-
- <logger name="com.att.eelf.metrics" level="info" additivity="false">
- <appender-ref ref="asyncEELFMetrics" />
- </logger>
-
- <logger name="com.att.eelf.error" level="error" additivity="false">
- <appender-ref ref="asyncEELFError" />
- </logger>
-
- <!-- <logger name="com.att.eelf.debug" level="info" additivity="false"> -->
- <logger name="com.att.eelf.debug" level="debug" additivity="false">
- <appender-ref ref="asyncEELFDebug" />
- </logger>
-
- <!-- <root level="INFO"> -->
- <root level="DEBUG">
- <appender-ref ref="asyncEELFDebug" />
- <appender-ref ref="asyncEELFError" />
- </root>
-
-</configuration>
diff --git a/policy-persistence/src/test/resources/xacmlPersistence.properties b/policy-persistence/src/test/resources/xacmlPersistence.properties
deleted file mode 100644
index 284e87d..0000000
--- a/policy-persistence/src/test/resources/xacmlPersistence.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-persistence
-# ================================================================================
-# Copyright (C) 2017 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=========================================================
-###
-
-javax.persistence.jdbc.driver = org.h2.Driver
-javax.persistence.jdbc.url = jdbc:h2:file:./sql/xacml
-javax.persistence.jdbc.user = sa
-javax.persistence.jdbc.password =
-
-#javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver
-#javax.persistence.jdbc.url=jdbc:mariadb://127.0.0.1:3306/xacml
-#javax.persistence.jdbc.user=root
-#javax.persistence.jdbc.password=policy
-
-#javax.persistence.jdbc.driver = ${{JDBC_DRIVER}}
-#javax.persistence.jdbc.url = ${{JDBC_URL}}
-#javax.persistence.jdbc.user = ${{JDBC_USER}}
-#javax.persistence.jdbc.password = ${{JDBC_PASSWORD}}
-
-# Needed?
-hibernate.dataSource=org.mariadb.jdbc.MySQLDataSource
-
-# For testing purposes, it may be convenient to disable persistence
-persistenceDisabled=false
-
-
-
diff --git a/policy-persistence/src/test/server/config/IntegrityMonitor.properties b/policy-persistence/src/test/server/config/IntegrityMonitor.properties
deleted file mode 100644
index 5e7085c..0000000
--- a/policy-persistence/src/test/server/config/IntegrityMonitor.properties
+++ /dev/null
@@ -1,69 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-persistence
-# ================================================================================
-# Copyright (C) 2017 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=========================================================
-###
-
-# port 9981 fails on Jenkins, so try another.
-hostPort = 0.0.0.0:57692
-
-# The following were added as part of US673632
-#
-# Forward Progress Monitor update interval seconds
-fp_monitor_interval = 30
-# Failed counter threshold before failover
-failed_counter_threshold = 3
-# Interval between test transactions when no traffic seconds
-test_trans_interval = 10
-# Interval between writes of the FPC to the DB seconds
-write_fpc_interval = 5
-# Name of the site in which this node is hosted
-site_name = pdp_1
-# Node type. Can take values of: pdp-xacml, pdp-drools, pap, pap-admin, logparser, brms-gateway,
-# astra-gateway, elk-server and pypdpNode type
-# Note: Make sure you don't leave any trailing spaces, or you'll get an 'invalid node type' error!
-node_type = pdp_drools
-# Dependency groups are groups of resources upon which a node operational state is dependent upon.
-# Each group is a comma-separated list of resource names and groups are separated by a semicolon. For example:
-#For JUnit testing this must be empty since none of the other components exist
-#dependency_groups=site_1.astra_1,site_1.astra_2;site_1.brms_1,site_1.brms_2;site_1.logparser_1;site_1.pypdp_1
-dependency_groups=
-
-# Needed by DroolsPdpsElectionHandler
-pdp.checkInterval=1500
-pdp.updateInterval=1000
-#pdp.timeout=3000
-# Need long timeout, because testTransaction is only run every 10 seconds.
-pdp.timeout=15000
-#how long do we wait for the pdp table to populate on initial startup
-pdp.initialWait=20000
-
-# Known as the PDPID in the droolpdpentity table.
-resource.name=pdp1
-
-# The amount of this a resource (entity) should sleep between audit executions.
-# If not specified, defaults to five seconds.
-# -1 turns off audit
-# zero forces audit to run continuously
-integrity_audit_period_seconds=60
-
-# Flag to control the execution of the subsystemTest for the Database
-db.audit.is.active=false
-
-# Flag to control the execution of the subsystemTest for the Nexus Maven repository
-repository.audit.is.active=false
-repository.audit.ignore.errors=true
\ No newline at end of file
diff --git a/policy-persistence/src/test/server/config/droolsPersistence.properties b/policy-persistence/src/test/server/config/droolsPersistence.properties
deleted file mode 100644
index 8cdaf6a..0000000
--- a/policy-persistence/src/test/server/config/droolsPersistence.properties
+++ /dev/null
@@ -1,35 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-persistence
-# ================================================================================
-# Copyright (C) 2017 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=========================================================
-###
-
-javax.persistence.jdbc.driver = org.h2.Driver
-javax.persistence.jdbc.url = jdbc:h2:file:./sql/drools
-javax.persistence.jdbc.user = sa
-javax.persistence.jdbc.password =
-
-#javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver
-#javax.persistence.jdbc.url=jdbc:mariadb://localhost:3306/drools
-#javax.persistence.jdbc.user=root
-#javax.persistence.jdbc.password=policy
-
-# Needed?
-hibernate.dataSource=org.mariadb.jdbc.MySQLDataSource
-
-# For testing purposes, it may be convenient to disable persistence
-persistenceDisabled=false
diff --git a/policy-persistence/src/test/server/config/policyLogger.properties b/policy-persistence/src/test/server/config/policyLogger.properties
deleted file mode 100644
index 6ee66fd..0000000
--- a/policy-persistence/src/test/server/config/policyLogger.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-persistence
-# ================================================================================
-# Copyright (C) 2017 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=========================================================
-###
-
-################################### Set concurrentHashMap and timer info #######################
-#Timer initial delay and the delay between in milliseconds before task is to be execute.
-timer.delay.time=1000
-#Timer scheduleAtFixedRate period - time in milliseconds between successive task executions.
-check.interval= 30000
-#Longest time an event info can be stored in the concurrentHashMap for logging - in seconds.
-event.expired.time=86400
-#Size of the concurrentHashMap which stores the event starting time, etc - when its size reaches this limit, the Timer gets executed
-#to remove all expired records from this concurrentHashMap.
-concurrentHashMap.limit=5000
-#Size of the concurrentHashMap - when its size drops to this point, stop the Timer
-stop.check.point=2500
-################################### Set logging format #############################################
-# set EELF for EELF logging format, set LOG4J for using log4j, set SYSTEMOUT for using system.out.println
-logger.type=EELF
-#################################### Set level for EELF or SYSTEMOUT logging ##################################
-# Set level for debug file. Set DEBUG to enable .info, .warn and .debug; set INFO for enable .info and .warn; set OFF to disable all
-debugLogger.level=INFO
-# Set level for metrics file. Set OFF to disable; set ON to enable
-metricsLogger.level=ON
-# Set level for error file. Set OFF to disable; set ON to enable
-error.level=ON
-# Set level for audit file. Set OFF to disable; set ON to enable
-audit.level=ON
diff --git a/policy-persistence/src/test/server/config/xacmlPersistence.properties b/policy-persistence/src/test/server/config/xacmlPersistence.properties
deleted file mode 100644
index 149aa55..0000000
--- a/policy-persistence/src/test/server/config/xacmlPersistence.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# policy-persistence
-# ================================================================================
-# Copyright (C) 2017 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=========================================================
-###
-
-javax.persistence.jdbc.driver = org.h2.Driver
-javax.persistence.jdbc.url = jdbc:h2:file:./sql/xacml
-javax.persistence.jdbc.user = sa
-javax.persistence.jdbc.password =
-
-#javax.persistence.jdbc.driver=org.mariadb.jdbc.Driver
-#javax.persistence.jdbc.url=jdbc:mariadb://127.0.0.1:3306/xacml
-#javax.persistence.jdbc.user=root
-#javax.persistence.jdbc.password=policy
-
-# Needed?
-hibernate.dataSource=org.mariadb.jdbc.MySQLDataSource
-
-# For testing purposes, it may be convenient to disable persistence
-persistenceDisabled=false
-
-
-
diff --git a/policy-utils/pom.xml b/policy-utils/pom.xml
index d90b32b..509e293 100644
--- a/policy-utils/pom.xml
+++ b/policy-utils/pom.xml
@@ -37,14 +37,15 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
+ <scope>test</scope>
</dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.17</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>com.att.eelf</groupId>
<artifactId>eelf-core</artifactId>
<version>0.0.1</version>
diff --git a/pom.xml b/pom.xml
index 42f6d27..373e6b6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -42,6 +42,8 @@
<jersey.version>2.22.2</jersey.version>
<jersey.swagger.version>1.5.13</jersey.swagger.version>
<jackson.version>2.8.4</jackson.version>
+ <http.client>4.5</http.client>
+ <http.core>4.4.4</http.core>
<sonar.language>java</sonar.language>
<sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
@@ -61,7 +63,6 @@
<module>policy-core</module>
<module>policy-endpoints</module>
<module>policy-management</module>
- <module>policy-persistence</module>
<module>policy-healthcheck</module>
<module>packages</module>
</modules>
@@ -161,6 +162,16 @@
<artifactId>swagger-jersey2-jaxrs</artifactId>
<version>${jersey.swagger.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient</artifactId>
+ <version>${http.client}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore</artifactId>
+ <version>${http.core}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
diff --git a/project-configs/maven/conf/settings.xml b/project-configs/maven/conf/settings.xml
deleted file mode 100644
index 55687cd..0000000
--- a/project-configs/maven/conf/settings.xml
+++ /dev/null
@@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ============LICENSE_START=======================================================
- ECOMP Policy Engine - Drools PDP
- ================================================================================
- Copyright (C) 2017 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=========================================================
- -->
-
-
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more contributor
- license agreements. See the NOTICE file distributed with this work for additional
- information regarding copyright ownership. The ASF licenses this file to
- you 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. -->
-
-
-
-<!-- | This is the configuration file for Maven. It can be specified at two
- levels: | | 1. User Level. This settings.xml file provides configuration
- for a single user, | and is normally provided in ${user.home}/.m2/settings.xml.
- | | NOTE: This location can be overridden with the CLI option: | | -s /path/to/user/settings.xml
- | | 2. Global Level. This settings.xml file provides configuration for all
- Maven | users on a machine (assuming they're all using the same Maven | installation).
- It's normally provided in | ${maven.home}/conf/settings.xml. | | NOTE: This
- location can be overridden with the CLI option: | | -gs /path/to/global/settings.xml
- | | The sections in this sample file are intended to give you a running start
- at | getting the most out of your Maven installation. Where appropriate,
- the default | values (values used when the setting is not specified) are
- provided. | | -->
-<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0 http://maven.apache.org/xsd/settings-1.0.0.xsd">
- <!-- localRepository | The path to the local repository maven will use to
- store artifacts. | | Default: ${user.home}/.m2/repository <localRepository>/path/to/local/repo</localRepository> -->
- <localRepository>${user.home}/.m2/repository</localRepository>
- <!-- interactiveMode | This will determine whether maven prompts you when
- it needs input. If set to false, | maven will use a sensible default value,
- perhaps based on some other setting, for | the parameter in question. | |
- Default: true <interactiveMode>true</interactiveMode> -->
-
- <!-- offline | Determines whether maven should attempt to connect to the
- network when executing a build. | This will have an effect on artifact downloads,
- artifact deployment, and others. | | Default: false <offline>false</offline> -->
-
- <!-- pluginGroups | This is a list of additional group identifiers that
- will be searched when resolving plugins by their prefix, i.e. | when invoking
- a command line like "mvn prefix:goal". Maven will automatically add the group
- identifiers | "org.apache.maven.plugins" and "org.codehaus.mojo" if these
- are not already contained in the list. | -->
- <pluginGroups>
- <!-- pluginGroup | Specifies a further group identifier to use for plugin
- lookup. <pluginGroup>com.your.plugins</pluginGroup> -->
- </pluginGroups>
-
- <!-- proxies | This is a list of proxies which can be used on this machine
- to connect to the network. | Unless otherwise specified (by system property
- or command-line switch), the first proxy | specification in this list marked
- as active will be used. | -->
- <proxies>
- </proxies>
-
- <!-- servers | This is a list of authentication profiles, keyed by the server-id
- used within the system. | Authentication profiles can be used whenever maven
- must make a connection to a remote server. | -->
- <servers>
- <!-- server | Specifies the authentication information to use when connecting
- to a particular server, identified by | a unique name within the system (referred
- to by the 'id' attribute below). | | NOTE: You should either specify username/password
- OR privateKey/passphrase, since these pairings are | used together. | <server>
- <id>deploymentRepo</id> <username>repouser</username> <password>repopwd</password>
- </server> -->
-
- <!-- Another sample, using keys to authenticate. <server> <id>siteServer</id>
- <privateKey>/path/to/private/key</privateKey> <passphrase>optional; leave
- empty if not used.</passphrase> </server> -->
- </servers>
-
- <!-- mirrors | This is a list of mirrors to be used in downloading artifacts
- from remote repositories. | | It works like this: a POM may declare a repository
- to use in resolving certain artifacts. | However, this repository may have
- problems with heavy traffic at times, so people have mirrored | it to several
- places. | | That repository definition will have a unique id, so we can create
- a mirror reference for that | repository, to be used as an alternate download
- site. The mirror site will be the preferred | server for that repository.
- | -->
- <mirrors>
- <!-- mirror | Specifies a repository mirror site to use instead of a given
- repository. The repository that | this mirror serves has an ID that matches
- the mirrorOf element of this mirror. IDs are used | for inheritance and direct
- lookup purposes, and must be unique across the set of mirrors. | -->
- </mirrors>
-
- <!-- profiles | This is a list of profiles which can be activated in a variety
- of ways, and which can modify | the build process. Profiles provided in the
- settings.xml are intended to provide local machine- | specific paths and
- repository locations which allow the build to work in the local environment.
- | | For example, if you have an integration testing plugin - like cactus
- - that needs to know where | your Tomcat instance is installed, you can provide
- a variable here such that the variable is | dereferenced during the build
- process to configure the cactus plugin. | | As noted above, profiles can
- be activated in a variety of ways. One way - the activeProfiles | section
- of this document (settings.xml) - will be discussed later. Another way essentially
- | relies on the detection of a system property, either matching a particular
- value for the property, | or merely testing its existence. Profiles can also
- be activated by JDK version prefix, where a | value of '1.4' might activate
- a profile when the build is executed on a JDK version of '1.4.2_07'. | Finally,
- the list of active profiles can be specified directly from the command line.
- | | NOTE: For profiles defined in the settings.xml, you are restricted to
- specifying only artifact | repositories, plugin repositories, and free-form
- properties to be used as configuration | variables for plugins in the POM.
- | | -->
- <profiles>
- <!-- profile | Specifies a set of introductions to the build process, to
- be activated using one or more of the | mechanisms described above. For inheritance
- purposes, and to activate profiles via <activatedProfiles/> | or the command
- line, profiles have to have an ID that is unique. | | An encouraged best
- practice for profile identification is to use a consistent naming convention
- | for profiles, such as 'env-dev', 'env-test', 'env-production', 'user-jdcasey',
- 'user-brett', etc. | This will make it more intuitive to understand what
- the set of introduced profiles is attempting | to accomplish, particularly
- when you only have a list of profile id's for debug. | | This profile example
- uses the JDK version to trigger activation, and provides a JDK-specific repo.
- <profile> <id>jdk-1.4</id> <activation> <jdk>1.4</jdk> </activation> <repositories>
- <repository> <id>jdk14</id> <name>Repository for JDK 1.4 builds</name> <url>http://www.myhost.com/maven/jdk14</url>
- <layout>default</layout> <snapshotPolicy>always</snapshotPolicy> </repository>
- </repositories> </profile> -->
-
- <!-- | Here is another profile, activated by the system property 'target-env'
- with a value of 'dev', | which provides a specific path to the Tomcat instance.
- To use this, your plugin configuration | might hypothetically look like:
- | | ... | <plugin> | <groupId>org.myco.myplugins</groupId> | <artifactId>myplugin</artifactId>
- | | <configuration> | <tomcatLocation>${tomcatPath}</tomcatLocation> | </configuration>
- | </plugin> | ... | | NOTE: If you just wanted to inject this configuration
- whenever someone set 'target-env' to | anything, you could just leave off
- the <value/> inside the activation-property. | <profile> <id>env-dev</id>
- <activation> <property> <name>target-env</name> <value>dev</value> </property>
- </activation> <properties> <tomcatPath>/path/to/tomcat/instance</tomcatPath>
- </properties> </profile> -->
- </profiles>
-
- <!-- activeProfiles | List of profiles that are active for all builds. |
- <activeProfiles> <activeProfile>alwaysActiveProfile</activeProfile> <activeProfile>anotherAlwaysActiveProfile</activeProfile>
- </activeProfiles> -->
-</settings>