Menu
▾
▴
[Unicore-cvs-commits] SF.net SVN: unicore:[14543] unicorex/branches/unicorex-1.5.x/uas-core/src
|
From: <bsc...@us...> - 2012-10-08 09:22:05
|
Revision: 14543
http://unicore.svn.sourceforge.net/unicore/?rev=14543&view=rev
Author: bschuller
Date: 2012-10-08 09:21:57 +0000 (Mon, 08 Oct 2012)
Log Message:
-----------
fix reservation lifetime; better tests
Modified Paths:
--------------
unicorex/branches/unicorex-1.5.x/uas-core/src/main/java/de/fzj/unicore/uas/impl/reservation/ReservationManagementImpl.java
unicorex/branches/unicorex-1.5.x/uas-core/src/test/java/de/fzj/unicore/uas/testsuite/TestReservation.java
unicorex/branches/unicorex-1.5.x/uas-core/src/test/java/de/fzj/unicore/uas/testsuite/TestTSFClient.java
unicorex/branches/unicorex-1.5.x/uas-core/src/test/resources/simpleidb
unicorex/branches/unicorex-1.5.x/uas-core/src/test/resources/wsrflite.xml
Modified: unicorex/branches/unicorex-1.5.x/uas-core/src/main/java/de/fzj/unicore/uas/impl/reservation/ReservationManagementImpl.java
===================================================================
--- unicorex/branches/unicorex-1.5.x/uas-core/src/main/java/de/fzj/unicore/uas/impl/reservation/ReservationManagementImpl.java 2012-10-08 07:30:16 UTC (rev 14542)
+++ unicorex/branches/unicorex-1.5.x/uas-core/src/main/java/de/fzj/unicore/uas/impl/reservation/ReservationManagementImpl.java 2012-10-08 09:21:57 UTC (rev 14543)
@@ -58,7 +58,8 @@
public void initialise(String serviceName, Map<String, Object> initParams) throws Exception {
Calendar startTime=(Calendar)initParams.get(INITPARAM_STARTTIME);
ResourcesDocument resources=(ResourcesDocument)initParams.get(INITPARAM_RESOURCES);
-
+ //must do this here, since we want to use the default lifetime
+ setServiceName(serviceName);
//set lifetime to startTime+defaultLifetime
Calendar lifetime=Calendar.getInstance();
lifetime.setTime(startTime.getTime());
Modified: unicorex/branches/unicorex-1.5.x/uas-core/src/test/java/de/fzj/unicore/uas/testsuite/TestReservation.java
===================================================================
--- unicorex/branches/unicorex-1.5.x/uas-core/src/test/java/de/fzj/unicore/uas/testsuite/TestReservation.java 2012-10-08 07:30:16 UTC (rev 14542)
+++ unicorex/branches/unicorex-1.5.x/uas-core/src/test/java/de/fzj/unicore/uas/testsuite/TestReservation.java 2012-10-08 09:21:57 UTC (rev 14543)
@@ -5,6 +5,7 @@
import static org.junit.Assert.assertTrue;
import java.util.Calendar;
+import java.util.Date;
import org.ggf.schemas.jsdl.x2005.x11.jsdl.JobDefinitionDocument;
import org.ggf.schemas.jsdl.x2005.x11.jsdl.ResourcesDocument;
@@ -56,12 +57,19 @@
String resID=props.getReservationProperties().getReservationReference();
String resStatus=String.valueOf(props.getReservationProperties().getReservationStatus());
String resDesc=props.getReservationProperties().getReservationStatusDescription();
+ Date tt=props.getReservationProperties().getTerminationTime().getDateValue();
System.out.println("+++ Reservation ID="+resID);
System.out.println("+++ Reservation Status="+resStatus);
System.out.println("+++ Reservation Description="+resDesc);
- System.out.println("+++ Reservation TerminationTime="+props.getReservationProperties().getTerminationTime().getDateValue());
+ System.out.println("+++ Reservation TerminationTime="+tt);
assertEquals("OK",resDesc);
+ //must be starttime + two days (configured in wsrflite.xml)
+ Calendar expectedTT=(Calendar)startTime.clone();
+ expectedTT.add(Calendar.DATE, 2);
+ assertEquals(expectedTT.getTimeInMillis(), tt.getTime());
+
+
//check that termination time is larger than the start time
assertTrue(0>startTime.compareTo(props.getReservationProperties().getTerminationTime().getCalendarValue()));
Modified: unicorex/branches/unicorex-1.5.x/uas-core/src/test/java/de/fzj/unicore/uas/testsuite/TestTSFClient.java
===================================================================
--- unicorex/branches/unicorex-1.5.x/uas-core/src/test/java/de/fzj/unicore/uas/testsuite/TestTSFClient.java 2012-10-08 07:30:16 UTC (rev 14542)
+++ unicorex/branches/unicorex-1.5.x/uas-core/src/test/java/de/fzj/unicore/uas/testsuite/TestTSFClient.java 2012-10-08 09:21:57 UTC (rev 14543)
@@ -30,7 +30,9 @@
import de.fzj.unicore.wsrflite.Kernel;
import de.fzj.unicore.wsrflite.xmlbeans.client.RegistryClient;
import eu.unicore.bugsreporter.annotation.FunctionalTest;
+import eu.unicore.jsdl.extensions.AllowedType;
import eu.unicore.jsdl.extensions.ExecutionEnvironmentDescriptionDocument.ExecutionEnvironmentDescription;
+import eu.unicore.jsdl.extensions.MetadataDocument;
public class TestTSFClient extends RunDate {
String url;
@@ -133,6 +135,9 @@
assertTrue(tss.getApplications().size()>0);
for(ApplicationResourceType app: tss.getApplications()){
System.out.println("APP: "+app.getApplicationName());
+ if("Cat".equals(app.getApplicationName())){
+ checkMD(app);
+ }
}
//check execution environment
@@ -186,4 +191,10 @@
System.out.println(pd[0]);
}
+ private void checkMD(ApplicationResourceType app)throws Exception{
+ System.out.println("MD for "+app.getApplicationName());
+ MetadataDocument md=MetadataDocument.Factory.parse(app.getMetadata().toString());
+ System.out.println(md);
+ assertEquals(AllowedType.STRING,md.getMetadata().getArgumentArray(0).getArgumentMetadata().getType());
+ }
}
Modified: unicorex/branches/unicorex-1.5.x/uas-core/src/test/resources/simpleidb
===================================================================
--- unicorex/branches/unicorex-1.5.x/uas-core/src/test/resources/simpleidb 2012-10-08 07:30:16 UTC (rev 14542)
+++ unicorex/branches/unicorex-1.5.x/uas-core/src/test/resources/simpleidb 2012-10-08 09:21:57 UTC (rev 14543)
@@ -26,7 +26,7 @@
<jsdl:POSIXApplication xmlns:jsdl="http://schemas.ggf.org/jsdl/2005/11/jsdl-posix">
<jsdl:Executable>/bin/cat</jsdl:Executable>
<!-- with inline metadata -->
- <jsdl:Argument Type="string">infile</jsdl:Argument>
+ <jsdl:Argument Type="string" Description="The file to cat">$INFILE?</jsdl:Argument>
</jsdl:POSIXApplication>
</idb:IDBApplication>
Modified: unicorex/branches/unicorex-1.5.x/uas-core/src/test/resources/wsrflite.xml
===================================================================
--- unicorex/branches/unicorex-1.5.x/uas-core/src/test/resources/wsrflite.xml 2012-10-08 07:30:16 UTC (rev 14542)
+++ unicorex/branches/unicorex-1.5.x/uas-core/src/test/resources/wsrflite.xml 2012-10-08 09:21:57 UTC (rev 14543)
@@ -25,6 +25,10 @@
<property name="unicore.wsrflite.jetty.gzip.enable" value="true"/>
<property name="unicore.wsrflite.jetty.gzip.minGzipSize" value="0"/>
+ <!-- increased life time for reservations -->
+ <property name="wsrflite.lifetime.default.ReservationManagement" value="172800"/>
+
+
<!-- the services -->
<!-- the target system factory service -->
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|