gCubeSystem
/
resource-manager-gcore
16
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Scope creation and removal testers revised for RM test-suite 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/vre-management/ResourceManager@56052 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Manuele Simi 2012-06-28 03:15:24 +00:00
parent e92d9e1d9a
commit ca3b1b9c99
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
test/org/gcube/vremanagement/resourcemanager/testsuite/scopecontroller/CreateScopeTest.java
View File

@ -12,7 +12,6 @@ import org.gcube.vremanagement.resourcemanager.stubs.scontroller.CreateScopePara
import org.gcube.vremanagement.resourcemanager.stubs.scontroller.OptionsParameters;
import org.gcube.vremanagement.resourcemanager.stubs.scontroller.ScopeControllerPortType;
import org.gcube.vremanagement.resourcemanager.stubs.scontroller.ScopeOption;
import org.gcube.vremanagement.resourcemanager.stubs.scontroller.VOID;
import org.gcube.vremanagement.resourcemanager.stubs.scontroller.service.ScopeControllerServiceAddressingLocator;
public class CreateScopeTest {
@ -41,11 +40,9 @@ public class CreateScopeTest {
EndpointReferenceType endpoint = new EndpointReferenceType();
try {
endpoint.setAddress(new Address(args[0]));
endpoint.setAddress(new Address("http://" + args[0] + "/wsrf/services/gcube/vremanagement/resourcemanager/scopecontroller"));
ScopeControllerPortType pt = new ScopeControllerServiceAddressingLocator().getScopeControllerPortTypePort(endpoint);
pt = GCUBERemotePortTypeContext.getProxy(pt, GCUBEScope.getScope(resources.getProperty("callerScope").trim()), 90000);
pt = GCUBERemotePortTypeContext.getProxy(pt, GCUBEScope.getScope(resources.getProperty("callerScope").trim()), 90000);
logger.info("Setting the Scope parameters...");
OptionsParameters options = new OptionsParameters();
@ -63,9 +60,8 @@ public class CreateScopeTest {
params.setTargetScope(resources.getProperty("targetScope"));
params.setOptionsParameters(options);
//params.setAddResourcesParameters(add);
VOID reportID = pt.createScope(params);
logger.info("Returned report ID: " + reportID);
pt.createScope(params);
} catch (Exception e) {
logger.fatal("Failed to create VRE",e);
}
@ -73,10 +69,7 @@ public class CreateScopeTest {
}
static void printUsage() {
System.out.println("CreateScopeTest http://host:port/wsrf/services/gcube/vremanagement/ResourceManager <properties file>");
System.out.println("or");
System.out.println("CreateScopeTest https://host:port/wsrf/services/gcube/vremanagement/ResourceManager <properties file> <identity>");
System.err.println("CreateScopeTest http://host:port/wsrf/services/gcube/vremanagement/ResourceManager <properties file>");
System.exit(1);
}

11
test/org/gcube/vremanagement/resourcemanager/testsuite/scopecontroller/DisposeScopeTest.java
View File

@ -18,13 +18,12 @@ public class DisposeScopeTest {
*/
public static void main(String[] args) {
if ((args.length < 2) || (args.length > 3))
if (args.length < 2)
DisposeScopeTest.printUsage();
EndpointReferenceType endpoint = new EndpointReferenceType();
EndpointReferenceType endpoint = new EndpointReferenceType();
try {
endpoint.setAddress(new Address(args[0]));
endpoint.setAddress(new Address("http://" + args[0] + "/wsrf/services/gcube/vremanagement/resourcemanager/scopecontroller"));
ScopeControllerPortType pt = new ScopeControllerServiceAddressingLocator().getScopeControllerPortTypePort(endpoint);
pt = GCUBERemotePortTypeContext.getProxy(pt, GCUBEScope.getScope(args[1].trim()));
logger.info("Sending the destroy request....");
@ -37,9 +36,7 @@ public class DisposeScopeTest {
}
static void printUsage() {
System.out.println("DisposeScopeTest http://host:port/wsrf/services/gcube/vremanagement/ResourceManager <scope>");
System.out.println("or");
System.out.println("DisposeScopeTest https://host:port/wsrf/services/gcube/vremanagement/ResourceManager <scope> <identity>");
System.out.println("DisposeScopeTest <host:port> <scope>");
System.exit(1);
}