merge from 0.14

sbin/dm_sync_aps_user_accounts.sh

+#!/bin/sh
+
+#
+# Script used for syncing APS user accounts
+
+# Usage:
+#
+#   $0 
+#
+
+CURRENT_DIR=`pwd`
+MY_DIR=`dirname $0` && cd $MY_DIR && MY_DIR=`pwd`
+cd $CURRENT_DIR
+DM_ROOT_DIR=$MY_DIR/..
+DM_ENV_FILE=${DM_ROOT_DIR}/setup.sh
+if [ ! -f ${DM_ENV_FILE} ]; then
+    echo "Environment file ${DM_ENV_FILE} does not exist." 
+    exit 2
+fi
+. ${DM_ENV_FILE} > /dev/null 
+DM_CONFIG_FILE=$DM_ROOT_DIR/../etc/dm.aps-user-update-utilities.conf
+
+# Simply run update command after sourcing setup file
+dm-update-users-from-aps-db --config-file=$DM_CONFIG_FILE --quiet
+

setup.sh

@@ -109,6 +109,7 @@ fi
 oracleDir=$DM_SUPPORT_DIR/opt/oracle-client/$DM_HOST_ARCH
 if [ -d $oracleDir ]; then
     LD_LIBRARY_PATH=$oracleDir:$LD_LIBRARY_PATH
+    PATH=$oracleDir:$PATH
 fi
 
 # Get back to where we were before invoking the setup script

src/python/dm/__init__.py

-__version__ = "0.13 (2016.05.27)"
+__version__ = "0.14 (2016.10.13)"

src/python/dm/aps_user_db/cli/updateUsersFromApsDbCli.py

@@ -150,6 +150,10 @@ Description:
                         # datetime cannot handle time zone at the moment
                         timeZonePos = dmLastUpdate.rfind('-')
                         dmLastUpdate = dmLastUpdate[0:timeZonePos]
+                        # remove microseconds from the timestamp
+                        secondPos = dmLastUpdate.rfind('.')
+                        if secondPos > 0:
+                            dmLastUpdate = dmLastUpdate[0:secondPos]
                         dmLastUpdate = datetime.datetime.strptime(dmLastUpdate, '%Y-%m-%d %H:%M:%S')
                     if not dmLastUpdate or dmLastUpdate < apsLastChangeDate:
                         # User needs update

src/python/dm/aps_user_db/impl/apsUserDbManager.py

@@ -87,7 +87,7 @@ class ApsUserDbManager:
             self.logger.debug('Mapping DB tables')
             for (dbTableName, (dbEntityClass, dbRelationDict)) in apsUserDbEntityMap.APS_USER_DB_ENTITY_MAP.items():
                 self.mapTable(dbEntityClass, dbTableName, dbRelationDict)
-            self.logger.debug('Initialized SQLalchemy engines')
+            self.logger.debug('Initialized SQLalchemy APS User DB engine')
 
         finally:
             ApsUserDbManager.__lock.release()