diff --git a/clc/modules/www/src/main/java/com/eucalyptus/webui/client/activity/ReportActivity.java b/clc/modules/www/src/main/java/com/eucalyptus/webui/client/activity/ReportActivity.java index 4e7aabc7cd2..f10187f1598 100644 --- a/clc/modules/www/src/main/java/com/eucalyptus/webui/client/activity/ReportActivity.java +++ b/clc/modules/www/src/main/java/com/eucalyptus/webui/client/activity/ReportActivity.java @@ -93,7 +93,7 @@ public void generateReport( Date fromDate, Date toDate, String criteria, String + "&type=" + type + "&format=HTML" + "&start=" + fromDate.getTime() - + "&end=" + toDate.getTime() + + "&end=" + (toDate.getTime()+(1000*60*60*24)) //Add one day because UI says "start" and "THRU + "&criterion=" + criteria + "&groupByCriterion=" + groupBy; diff --git a/devel/import_databases.sh b/devel/import_databases.sh new file mode 100755 index 00000000000..872090df26c --- /dev/null +++ b/devel/import_databases.sh @@ -0,0 +1,12 @@ +openssl pkcs12 -in ${EUCALYPTUS}/var/lib/eucalyptus/keys/euca.p12 \ +-name eucalyptus -name "eucalyptus" \ +-password pass:eucalyptus -passin pass:eucalyptus -passout pass:eucalyptus \ +-nodes | \ +grep -A30 "friendlyName: eucalyptus" | \ +egrep -A27 "BEGIN (RSA|PRIVATE)" | grep -v 'Bag Attributes' > ${EUCALYPTUS}/var/lib/eucalyptus/keys/cloud-pk.pem + +PASS=$($(dirname $(readlink -f $0))/dbPass.sh) + +echo $0 +mysql -u eucalyptus --password=${PASS} --port=8777 --protocol=TCP < $1 +