Merge remote-tracking branch 'origin/main' into multi-tenant
This commit is contained in:
@@ -2,6 +2,7 @@
|
||||
|
||||
USER="root"
|
||||
PASSWORD="1000omc@kp!"
|
||||
HOST="127.0.0.1"
|
||||
PORT="33066"
|
||||
DBNAME="tenants_db"
|
||||
UpgradeSQLDir=/usr/local/omc/etc/db/upgrade
|
||||
@@ -16,7 +17,7 @@ case "$1" in
|
||||
echo "Upgrade database ${DBNAME}"
|
||||
for SQL in ${UpgradeSQLDir}/*.sql; do
|
||||
echo -n "Execute SQL script: ${SQL} ..."
|
||||
mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL};
|
||||
mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL};
|
||||
if [ $? = 0 ]; then
|
||||
echo "done"
|
||||
fi
|
||||
@@ -27,7 +28,7 @@ case "$1" in
|
||||
echo "Upgrade to vue3 database ${DBNAME}"
|
||||
for SQL in ${Upgvue3SQLDir}/*.sql; do
|
||||
echo -n "Execute SQL script: ${SQL} ..."
|
||||
mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL};
|
||||
mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL};
|
||||
if [ $? = 0 ]; then
|
||||
echo "done"
|
||||
fi
|
||||
@@ -36,12 +37,12 @@ case "$1" in
|
||||
|
||||
install)
|
||||
echo "Drop database ${DBNAME} ...!!!"
|
||||
mysql -u${USER} -p${PASSWORD} -P $PORT --protocol tcp -e "${drop_db_sql}"
|
||||
mysql -u${USER} -p${PASSWORD} -P $PORT -h ${HOST} --protocol tcp -e "${drop_db_sql}"
|
||||
echo "Create database ${DBNAME} if not exist"
|
||||
mysql -u${USER} -p${PASSWORD} -P $PORT --protocol tcp -e "${create_db_sql}"
|
||||
mysql -u${USER} -p${PASSWORD} -P $PORT -h ${HOST} --protocol tcp -e "${create_db_sql}"
|
||||
for SQL in ${InstallSQLDir}/*.sql; do
|
||||
echo -n "Execute SQL script: ${SQL} ..."
|
||||
mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL};
|
||||
mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL};
|
||||
if [ $? = 0 ]; then
|
||||
echo "done"
|
||||
fi
|
||||
@@ -60,7 +61,7 @@ case "$1" in
|
||||
|
||||
for SQL in ${UpgradeSQLDir}/*.sql; do
|
||||
echo -n "Execute SQL script: ${SQL} ..."
|
||||
mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL};
|
||||
mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL};
|
||||
if [ $? = 0 ]; then
|
||||
echo "done"
|
||||
fi
|
||||
@@ -75,7 +76,7 @@ case "$1" in
|
||||
|
||||
for SQL in ${Upgvue3SQLDir}/*.sql; do
|
||||
echo -n "Execute SQL script: ${SQL} ..."
|
||||
mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL};
|
||||
mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL};
|
||||
if [ $? = 0 ]; then
|
||||
echo "done"
|
||||
fi
|
||||
@@ -87,13 +88,13 @@ case "$1" in
|
||||
[iI][nN][sS][tT][aA][lL][lL]|[iI])
|
||||
echo "Drop database ${DBNAME} ...!!!"
|
||||
|
||||
mysql -u${USER} -p${PASSWORD} -P $PORT --protocol tcp -e "${drop_db_sql}"
|
||||
mysql -u${USER} -p${PASSWORD} -P $PORT -h ${HOST} --protocol tcp -e "${drop_db_sql}"
|
||||
echo "Create database ${DBNAME} if not exist"
|
||||
mysql -u${USER} -p${PASSWORD} -P $PORT --protocol tcp -e "${create_db_sql}"
|
||||
mysql -u${USER} -p${PASSWORD} -P $PORT -h ${HOST} --protocol tcp -e "${create_db_sql}"
|
||||
|
||||
for SQL in ${InstallSQLDir}/*.sql; do
|
||||
echo -n "Execute SQL script: ${SQL} ..."
|
||||
mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} < ${SQL};
|
||||
mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} < ${SQL};
|
||||
if [ $? = 0 ]; then
|
||||
echo "done"
|
||||
fi
|
||||
@@ -116,12 +117,18 @@ case "$1" in
|
||||
esac
|
||||
|
||||
# create kpi_report table with ne_type, exp: kpi_report_amf
|
||||
ne_types=$(mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -se "SELECT DISTINCT LOWER(ne_type) FROM kpi_title")
|
||||
ne_types=$(mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -se "SELECT DISTINCT LOWER(ne_type) FROM kpi_title")
|
||||
for ne_type in ${ne_types}; do
|
||||
TABLE_NAME="kpi_report_${ne_type}"
|
||||
SQL="CREATE TABLE IF NOT EXISTS ${TABLE_NAME} LIKE \`kpi_report\`;"
|
||||
echo -n "Create table: ${TABLE_NAME} ..."
|
||||
mysql -u${USER} -p${PASSWORD} -P ${PORT} --protocol tcp -D ${DBNAME} -e "${SQL}"
|
||||
mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -e "${SQL}"
|
||||
if [ $? = 0 ]; then
|
||||
echo "done"
|
||||
fi
|
||||
SQL="ALTER TABLE ${TABLE_NAME} ADD INDEX IF NOT EXISTS \`idx_timestamp\`(\`created_at\`) USING BTREE, ADD INDEX IF NOT EXISTS \`idx_uid_datetime\`(\`rm_uid\`, \`date\`, \`start_time\`) USING BTREE;"
|
||||
echo -n "Create index of ${TABLE_NAME} ..."
|
||||
mysql -u${USER} -p${PASSWORD} -P ${PORT} -h ${HOST} --protocol tcp -D ${DBNAME} -e "${SQL}"
|
||||
if [ $? = 0 ]; then
|
||||
echo "done"
|
||||
fi
|
||||
|
||||
@@ -1,5 +1,8 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Read the value of the variable from file
|
||||
source /usr/local/omc/etc/omc.conf
|
||||
|
||||
C_ARG_LOWER="agt"
|
||||
C_ARG_UPPER="AGT"
|
||||
M_ARG_LOWER="*"
|
||||
@@ -10,9 +13,21 @@ check_args() {
|
||||
c)
|
||||
C_ARG_LOWER=$(echo $OPTARG | tr '[:upper:]' '[:lower:]')
|
||||
C_ARG_UPPER=$(echo $OPTARG | tr '[:lower:]' '[:upper:]')
|
||||
# Modifying Script Variables
|
||||
if [ "${C_ARG_LOWER}" == "ba" ]; then
|
||||
C_ARG_UPPER="BA"
|
||||
sed -i 's/VENDORS=.*/VENDORS=BA/' /usr/local/omc/etc/omc.conf
|
||||
elif [ "${C_ARG_LOWER}" == "agt" ]; then
|
||||
C_ARG_UPPER="AGT"
|
||||
sed -i 's/VENDORS=.*/VENDORS=AGT/' /usr/local/omc/etc/omc.conf
|
||||
fi
|
||||
;;
|
||||
m)
|
||||
M_ARG=$(echo $OPTARG | tr '[:upper:]' '[:lower:]')
|
||||
if [ "${VENDORS}" == "BA" ]; then
|
||||
C_ARG_LOWER="ba"
|
||||
C_ARG_UPPER="BA"
|
||||
fi
|
||||
;;
|
||||
\?)
|
||||
echo "Invalid option: -$OPTARG" >&2
|
||||
@@ -50,8 +65,8 @@ case "${M_ARG}" in
|
||||
done
|
||||
cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo
|
||||
cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc
|
||||
perl -0777 -i -pe 's/manager/bluearcus/g' ${OMCRootDir}/etc/default/restconf.yaml
|
||||
perl -0777 -i -pe 's/manager/bluearcus/g' ${OMCBinDir}/nehosts
|
||||
#perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCRootDir}/etc/default/restconf.yaml
|
||||
#perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCBinDir}/nehosts
|
||||
fi
|
||||
;;
|
||||
upgrade | upgvue3)
|
||||
|
||||
Reference in New Issue
Block a user