Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fixed test suites

  • Loading branch information...
commit 02ea4fffb4bb4ccc076d1f39b7121cc7f408f418 1 parent a61859c
@pauloricardomg pauloricardomg authored
Showing with 468 additions and 114 deletions.
  1. +19 −1 service/service/java/tests/suites/basic/home/services/etc/nimbus/elastic/other/main.conflocator.xml
  2. +47 −1 service/service/java/tests/suites/basic/home/services/etc/nimbus/elastic/other/main.xml
  3. +17 −0 service/service/java/tests/suites/basic/home/services/etc/nimbus/query/other/main.conflocator.xml
  4. +45 −12 service/service/java/tests/suites/basic/home/services/etc/nimbus/query/other/main.xml
  5. +7 −0 service/service/java/tests/suites/basic/home/services/etc/nimbus/workspace-service/other/main.conflocator.xml
  6. +2 −2 service/service/java/tests/suites/basic/home/services/etc/nimbus/workspace-service/other/main.xml
  7. +15 −6 service/service/java/tests/suites/basic/home/services/etc/nimbus/workspace-service/spotinstances.conf
  8. +17 −5 ...ice/java/tests/suites/spotinstances/noresources/home/services/etc/nimbus/elastic/other/main.conflocator.xml
  9. +47 −13 service/service/java/tests/suites/spotinstances/noresources/home/services/etc/nimbus/elastic/other/main.xml
  10. +17 −0 ...rvice/java/tests/suites/spotinstances/noresources/home/services/etc/nimbus/query/other/main.conflocator.xml
  11. +45 −12 service/service/java/tests/suites/spotinstances/noresources/home/services/etc/nimbus/query/other/main.xml
  12. +7 −0 ...ests/suites/spotinstances/noresources/home/services/etc/nimbus/workspace-service/other/main.conflocator.xml
  13. +2 −2 ...rvice/java/tests/suites/spotinstances/noresources/home/services/etc/nimbus/workspace-service/other/main.xml
  14. +15 −6 ...e/java/tests/suites/spotinstances/noresources/home/services/etc/nimbus/workspace-service/spotinstances.conf
  15. +1 −1  ...ce/service/java/tests/suites/spotinstances/singleresourcepool/home/services/etc/nimbus/elastic/elastic.conf
  16. +17 −5 ...a/tests/suites/spotinstances/singleresourcepool/home/services/etc/nimbus/elastic/other/main.conflocator.xml
  17. +47 −13 .../service/java/tests/suites/spotinstances/singleresourcepool/home/services/etc/nimbus/elastic/other/main.xml
  18. +17 −0 ...ava/tests/suites/spotinstances/singleresourcepool/home/services/etc/nimbus/query/other/main.conflocator.xml
  19. +45 −12 ...ce/service/java/tests/suites/spotinstances/singleresourcepool/home/services/etc/nimbus/query/other/main.xml
  20. +7 −0 ...ites/spotinstances/singleresourcepool/home/services/etc/nimbus/workspace-service/other/main.conflocator.xml
  21. +2 −2 ...ava/tests/suites/spotinstances/singleresourcepool/home/services/etc/nimbus/workspace-service/other/main.xml
  22. +15 −6 ...tests/suites/spotinstances/singleresourcepool/home/services/etc/nimbus/workspace-service/spotinstances.conf
  23. +5 −5 ...va/tests/suites/spotinstances/src/org/globus/workspace/testing/suites/spotinstances/NoResourcesSISuite.java
  24. +10 −10 ...s/suites/spotinstances/src/org/globus/workspace/testing/suites/spotinstances/SingleResourcePoolSISuite.java
View
20 service/service/java/tests/suites/basic/home/services/etc/nimbus/elastic/other/main.conflocator.xml
@@ -28,6 +28,15 @@
<property name="placeholderPrefix" value="$COMMON{" />
</bean>
+ <bean id="cumulusSettings"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+
+ <!-- grab some shared settings from the workspace-service cumulus.conf file,
+ will have to adjust for other deployment scenarios -->
+ <property name="location" value="$NIMBUS_HOME/services/etc/nimbus/workspace-service/cumulus.conf" />
+ <property name="placeholderPrefix" value="$CUMULUS{" />
+ </bean>
+
<bean id="elasticSettings"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -42,10 +51,19 @@
<property name="placeholderPrefix" value="$OTHER_ELASTIC{" />
</bean>
- <bean id="querySettings"
+ <bean id="querySettings"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location" value="$NIMBUS_HOME/services/etc/nimbus/query/query.conf" />
<property name="placeholderPrefix" value="$QUERY{" />
</bean>
+ <bean id="siSettings"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+
+ <property name="location"
+ value="$NIMBUS_HOME/services/etc/nimbus/workspace-service/spotinstances.conf" />
+ <property name="placeholderPrefix"
+ value="$SI{" />
+ </bean>
+
</beans>
View
48 service/service/java/tests/suites/basic/home/services/etc/nimbus/elastic/other/main.xml
@@ -18,6 +18,7 @@
<constructor-arg ref="nimbus-elastic.rm.terminate" />
<constructor-arg ref="nimbus-elastic.rm.reboot" />
<constructor-arg ref="nimbus-elastic.rm.describe" />
+ <constructor-arg ref="nimbus-elastic.rm.requestSI" />
<constructor-arg ref="nimbus-elastic.rm.containerInterface" />
<constructor-arg ref="nimbus-elastic.rm.modulelocator" />
@@ -37,6 +38,20 @@
</bean>
+ <bean id="nimbus-elastic.rm.requestSI"
+ class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.defaults.DefaultRequestSI">
+
+ <constructor-arg ref="nimbus-elastic.general.ra" />
+ <constructor-arg ref="nimbus-elastic.general.networks" />
+ <constructor-arg ref="nimbus-elastic.rm.idmappings" />
+ <constructor-arg ref="nimbus-elastic.rm.describe" />
+ <constructor-arg ref="nimbus-elastic.rm.containerInterface" />
+ <constructor-arg ref="nimbus-elastic.security.sshkeys" />
+ <constructor-arg ref="nimbus-elastic.image.repository" />
+ <constructor-arg ref="nimbus-elastic.rm.modulelocator" />
+
+ </bean>
+
<bean id="nimbus-elastic.rm.terminate"
class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.defaults.DefaultTerminate">
@@ -106,6 +121,7 @@
<property name="cpuArch" value="$OTHER_ELASTIC{cpu.arch}" />
<property name="vmmType" value="$OTHER_ELASTIC{vmm.type}" />
<property name="vmmVersion" value="$OTHER_ELASTIC{vmm.version}" />
+ <property name="siType" value="$SI{si.instancetype}" />
</bean>
@@ -180,6 +196,7 @@
</bean>
+ <!--
<bean id="nimbus-elastic.image.repository"
class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.image.defaults.DefaultRepository"
init-method="validate">
@@ -195,7 +212,36 @@
<property name="idAuthz" value="$ELASTIC{repository.idauthz}" />
</bean>
-
+ -->
+ <bean id="other.AuthzDataSource"
+ class="org.apache.commons.dbcp.BasicDataSource">
+ <property name="driverClassName" value="org.sqlite.JDBC" />
+ <property name="maxActive" value="10" />
+ <property name="maxIdle" value="4" />
+ <property name="maxWait" value="2000" />
+ <property name="poolPreparedStatements" value="true" />
+
+ <property name="url"
+ value="jdbc:sqlite://$CUMULUS{cumulus.authz.db}" />
+ <property name="username" value="nimbus"/>
+ <property name="password" value="nimbus"/>
+ </bean>
+
+ <bean id="nimbus-elastic.image.repository"
+ class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.image.defaults.CumulusRepository"
+ init-method="validate">
+
+ <constructor-arg ref="nimbus-elastic.rm.containerInterface" />
+ <constructor-arg ref="nimbus-elastic.rm.modulelocator" />
+ <constructor-arg ref="other.AuthzDataSource" />
+
+ <property name="repoBucket" value="$CUMULUS{cumulus.repo.bucket}" />
+ <property name="prefix" value="$CUMULUS{cumulus.repo.prefix}" />
+ <property name="cumulusHost" value="$CUMULUS{cumulus.host}" />
+ <property name="rootFileMountAs" value="$OTHER_ELASTIC{rootfile.mountas}" />
+
+ </bean>
+
<bean id="nimbus-query.httpserver"
class="org.nimbustools.messaging.query.HttpQuery"
init-method="startListening">
View
17 service/service/java/tests/suites/basic/home/services/etc/nimbus/query/other/main.conflocator.xml
@@ -28,6 +28,15 @@
<property name="placeholderPrefix" value="$COMMON{" />
</bean>
+ <bean id="cumulusSettings"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+
+ <!-- grab some shared settings from the workspace-service cumulus.conf file,
+ will have to adjust for other deployment scenarios -->
+ <property name="location" value="$NIMBUS_HOME/services/etc/nimbus/workspace-service/cumulus.conf" />
+ <property name="placeholderPrefix" value="$CUMULUS{" />
+ </bean>
+
<bean id="elasticSettings"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -48,4 +57,12 @@
<property name="placeholderPrefix" value="$QUERY{" />
</bean>
+ <bean id="siSettings"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location"
+ value="$NIMBUS_HOME/services/etc/nimbus/workspace-service/spotinstances.conf" />
+ <property name="placeholderPrefix"
+ value="$SI{" />
+ </bean>
+
</beans>
View
57 service/service/java/tests/suites/basic/home/services/etc/nimbus/query/other/main.xml
@@ -49,11 +49,27 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
<property name="userDetailsService" ref="userDetailsService"/>
</bean>
-
- <bean id="userDetailsService" class="org.nimbustools.messaging.query.security.FileUserDetailsService">
- <constructor-arg value="$QUERY{query.usermap.path}"/>
+ <bean id="other.AuthzDataSource"
+ class="org.apache.commons.dbcp.BasicDataSource">
+ <property name="driverClassName" value="org.sqlite.JDBC" />
+ <property name="maxActive" value="10" />
+ <property name="maxIdle" value="4" />
+ <property name="maxWait" value="2000" />
+ <property name="poolPreparedStatements" value="true" />
+
+ <property name="url"
+ value="jdbc:sqlite://$CUMULUS{cumulus.authz.db}" />
+ <property name="username" value="nimbus"/>
+ <property name="password" value="nimbus"/>
+ </bean>
+
+ <bean id="authzDBAdapter" class="org.nimbus.authz.AuthzDBAdapter">
+ <constructor-arg ref="other.AuthzDataSource"/>
</bean>
+ <bean id="userDetailsService" class="org.nimbustools.messaging.query.security.NimbusAuthzUserDetailsService">
+ <property name="authzDBAdapter" ref="authzDBAdapter" />
+ </bean>
<bean id="elasticQuery" class="org.nimbustools.messaging.query.ElasticQuery">
<property name="versions">
@@ -91,6 +107,7 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
<constructor-arg ref="nimbus-query.rm.terminate" />
<constructor-arg ref="nimbus-query.rm.reboot" />
<constructor-arg ref="nimbus-query.rm.describe" />
+ <constructor-arg ref="nimbus-query.rm.requestSI" />
<constructor-arg ref="nimbus-query.rm.containerInterface" />
<constructor-arg ref="nimbus-query.rm.modulelocator" />
@@ -110,6 +127,21 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
</bean>
+ <bean id="nimbus-query.rm.requestSI"
+ class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.defaults.DefaultRequestSI">
+
+ <constructor-arg ref="nimbus-query.general.ra" />
+ <constructor-arg ref="nimbus-query.general.networks" />
+ <constructor-arg ref="nimbus-query.rm.idmappings" />
+ <constructor-arg ref="nimbus-query.rm.describe" />
+ <constructor-arg ref="nimbus-query.rm.containerInterface" />
+ <constructor-arg ref="nimbus-query.security.sshkeys" />
+ <constructor-arg ref="nimbus-query.image.repository" />
+ <constructor-arg ref="nimbus-query.rm.modulelocator" />
+
+ </bean>
+
+
<bean id="nimbus-query.rm.terminate"
class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.defaults.DefaultTerminate">
@@ -176,6 +208,7 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
<property name="largeName" value="$OTHER_ELASTIC{ra.name.large}" />
<property name="xlargeName" value="$OTHER_ELASTIC{ra.name.xlarge}" />
<property name="unknownString" value="$OTHER_ELASTIC{ra.name.unknown}" />
+ <property name="siType" value="$SI{si.instancetype}" />
<property name="cpuArch" value="$OTHER_ELASTIC{cpu.arch}" />
<property name="vmmType" value="$OTHER_ELASTIC{vmm.type}" />
@@ -254,20 +287,20 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
</bean>
- <bean id="nimbus-query.image.repository"
- class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.image.defaults.DefaultRepository"
+ <bean id="nimbus-query.image.repository"
+ class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.image.defaults.CumulusRepository"
init-method="validate">
<constructor-arg ref="nimbus-query.rm.containerInterface" />
- <constructor-arg ref="nimbus-query.rm.modulelocator" />
-
- <property name="baseDirectory" value="$ELASTIC{base.directory.url}" />
- <property name="scheme" value="$ELASTIC{propagation.method}" />
- <property name="rootFileMountAs" value="$OTHER_ELASTIC{rootfile.mountas}" />
+ <constructor-arg ref="nimbus-query.rm.modulelocator" />
+ <constructor-arg ref="other.AuthzDataSource" />
- <property name="enableListing" value="$ELASTIC{repository.listing.enabled}" />
- <property name="idAuthz" value="$ELASTIC{repository.idauthz}" />
+ <property name="repoBucket" value="$CUMULUS{cumulus.repo.bucket}" />
+ <property name="prefix" value="$CUMULUS{cumulus.repo.prefix}" />
+ <property name="cumulusHost" value="$CUMULUS{cumulus.host}" />
+ <property name="rootFileMountAs" value="$OTHER_ELASTIC{rootfile.mountas}" />
+
</bean>
View
7 ...ce/service/java/tests/suites/basic/home/services/etc/nimbus/workspace-service/other/main.conflocator.xml
@@ -136,4 +136,11 @@
</bean>
+ <bean id="elasticSettings"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+
+ <property name="location" value="$NIMBUS_HOME/services/etc/nimbus/elastic/elastic.conf" />
+ <property name="placeholderPrefix" value="$ELASTIC{" />
+ </bean>
+
</beans>
View
4 service/service/java/tests/suites/basic/home/services/etc/nimbus/workspace-service/other/main.xml
@@ -558,7 +558,7 @@
<constructor-arg ref="nimbus-rm.loglevels" />
<constructor-arg ref="nimbus-rm.home.instance"/>
<constructor-arg ref="nimbus-rm.home.group"/>
- <constructor-arg value="$SI{si.basic.minprice}" />
+ <constructor-arg value="$SI{si.minprice}" />
<constructor-arg ref="nimbus-rm.si.pricingmodel" />
<!-- set after object creation time to avoid circular dep -->
@@ -570,7 +570,7 @@
<property name="maxUtilization"
value="$SI{async.policies.maxutilization}" />
<property name="instanceMem"
- value="$SI{si.basic.mem}" />
+ value="$ELASTIC{memory.$SI{si.instancetype}}" />
</bean>
View
21 service/service/java/tests/suites/basic/home/services/etc/nimbus/workspace-service/spotinstances.conf
@@ -61,15 +61,24 @@ si.pricingmodel=org.globus.workspace.async.pricingmodel.MaximizeUtilizationPrici
# BASIC SPOT INSTANCE CONFIGURATION:
####################################
-# Defines the amount of memory (in MegaBytes) that
-# a Spot Instance of the basic type has
+# Defines the instance type that will become
+# available as spot instances
+#
+# The supported instance types are:
+# small, large and xlarge.
+#
+# The amount of memory for each instance type
+# is defined in the elastic.conf file.
+#
+# Currently, Nimbus only supports one type
+# of Spot Instance type per site.
-si.basic.mem=128
+si.instancetype=small
# Defines the minimum price (in allocation units) per minute
-# that a Spot Instance of the basic type can cost
+# that a Spot Instance can cost
-si.basic.minprice=0.1
+si.minprice=0.1
#############################
@@ -115,4 +124,4 @@ async.policies.minreservedmem=256
#
# * reservedMem = (1 - maxUtilization)*usedMem/maxUtilization
-async.policies.maxutilization=0.7
+async.policies.maxutilization=0.7
View
22 .../java/tests/suites/spotinstances/noresources/home/services/etc/nimbus/elastic/other/main.conflocator.xml
@@ -28,6 +28,15 @@
<property name="placeholderPrefix" value="$COMMON{" />
</bean>
+ <bean id="cumulusSettings"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+
+ <!-- grab some shared settings from the workspace-service cumulus.conf file,
+ will have to adjust for other deployment scenarios -->
+ <property name="location" value="$NIMBUS_HOME/services/etc/nimbus/workspace-service/cumulus.conf" />
+ <property name="placeholderPrefix" value="$CUMULUS{" />
+ </bean>
+
<bean id="elasticSettings"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -42,16 +51,19 @@
<property name="placeholderPrefix" value="$OTHER_ELASTIC{" />
</bean>
- <bean id="querySettings"
+ <bean id="querySettings"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location" value="$NIMBUS_HOME/services/etc/nimbus/query/query.conf" />
<property name="placeholderPrefix" value="$QUERY{" />
</bean>
- <bean id="restSettings"
+ <bean id="siSettings"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="location" value="$NIMBUS_HOME/services/etc/nimbus/rest/rest.conf" />
- <property name="placeholderPrefix" value="$REST{" />
+
+ <property name="location"
+ value="$NIMBUS_HOME/services/etc/nimbus/workspace-service/spotinstances.conf" />
+ <property name="placeholderPrefix"
+ value="$SI{" />
</bean>
-</beans>
+</beans>
View
60 service/service/java/tests/suites/spotinstances/noresources/home/services/etc/nimbus/elastic/other/main.xml
@@ -18,6 +18,7 @@
<constructor-arg ref="nimbus-elastic.rm.terminate" />
<constructor-arg ref="nimbus-elastic.rm.reboot" />
<constructor-arg ref="nimbus-elastic.rm.describe" />
+ <constructor-arg ref="nimbus-elastic.rm.requestSI" />
<constructor-arg ref="nimbus-elastic.rm.containerInterface" />
<constructor-arg ref="nimbus-elastic.rm.modulelocator" />
@@ -37,6 +38,20 @@
</bean>
+ <bean id="nimbus-elastic.rm.requestSI"
+ class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.defaults.DefaultRequestSI">
+
+ <constructor-arg ref="nimbus-elastic.general.ra" />
+ <constructor-arg ref="nimbus-elastic.general.networks" />
+ <constructor-arg ref="nimbus-elastic.rm.idmappings" />
+ <constructor-arg ref="nimbus-elastic.rm.describe" />
+ <constructor-arg ref="nimbus-elastic.rm.containerInterface" />
+ <constructor-arg ref="nimbus-elastic.security.sshkeys" />
+ <constructor-arg ref="nimbus-elastic.image.repository" />
+ <constructor-arg ref="nimbus-elastic.rm.modulelocator" />
+
+ </bean>
+
<bean id="nimbus-elastic.rm.terminate"
class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.defaults.DefaultTerminate">
@@ -106,6 +121,7 @@
<property name="cpuArch" value="$OTHER_ELASTIC{cpu.arch}" />
<property name="vmmType" value="$OTHER_ELASTIC{vmm.type}" />
<property name="vmmVersion" value="$OTHER_ELASTIC{vmm.version}" />
+ <property name="siType" value="$SI{si.instancetype}" />
</bean>
@@ -180,6 +196,7 @@
</bean>
+ <!--
<bean id="nimbus-elastic.image.repository"
class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.image.defaults.DefaultRepository"
init-method="validate">
@@ -195,7 +212,36 @@
<property name="idAuthz" value="$ELASTIC{repository.idauthz}" />
</bean>
-
+ -->
+ <bean id="other.AuthzDataSource"
+ class="org.apache.commons.dbcp.BasicDataSource">
+ <property name="driverClassName" value="org.sqlite.JDBC" />
+ <property name="maxActive" value="10" />
+ <property name="maxIdle" value="4" />
+ <property name="maxWait" value="2000" />
+ <property name="poolPreparedStatements" value="true" />
+
+ <property name="url"
+ value="jdbc:sqlite://$CUMULUS{cumulus.authz.db}" />
+ <property name="username" value="nimbus"/>
+ <property name="password" value="nimbus"/>
+ </bean>
+
+ <bean id="nimbus-elastic.image.repository"
+ class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.image.defaults.CumulusRepository"
+ init-method="validate">
+
+ <constructor-arg ref="nimbus-elastic.rm.containerInterface" />
+ <constructor-arg ref="nimbus-elastic.rm.modulelocator" />
+ <constructor-arg ref="other.AuthzDataSource" />
+
+ <property name="repoBucket" value="$CUMULUS{cumulus.repo.bucket}" />
+ <property name="prefix" value="$CUMULUS{cumulus.repo.prefix}" />
+ <property name="cumulusHost" value="$CUMULUS{cumulus.host}" />
+ <property name="rootFileMountAs" value="$OTHER_ELASTIC{rootfile.mountas}" />
+
+ </bean>
+
<bean id="nimbus-query.httpserver"
class="org.nimbustools.messaging.query.HttpQuery"
init-method="startListening">
@@ -208,18 +254,6 @@
<property name="springConfigResource" value="$QUERY{query.spring.path}"/>
</bean>
- <!-- TODO this should happen somewhere else... -->
- <bean id="nimbus-rest.httpserver"
- class="org.nimbustools.messaging.rest.RestHttp"
- init-method="startListening">
- <property name="enabled" value="$REST{rest.enabled}" />
- <property name="port" value="$REST{rest.port}" />
- <property name="keystoreResource" value="$REST{keystore.path}"/>
- <property name="keystorePassword" value="$REST{keystore.password}"/>
- <property name="springConfigResource" value="$REST{rest.spring.path}"/>
- </bean>
-
-
<!--
property sources are concentrated in this file
-->
View
17 ...ce/java/tests/suites/spotinstances/noresources/home/services/etc/nimbus/query/other/main.conflocator.xml
@@ -28,6 +28,15 @@
<property name="placeholderPrefix" value="$COMMON{" />
</bean>
+ <bean id="cumulusSettings"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+
+ <!-- grab some shared settings from the workspace-service cumulus.conf file,
+ will have to adjust for other deployment scenarios -->
+ <property name="location" value="$NIMBUS_HOME/services/etc/nimbus/workspace-service/cumulus.conf" />
+ <property name="placeholderPrefix" value="$CUMULUS{" />
+ </bean>
+
<bean id="elasticSettings"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -48,4 +57,12 @@
<property name="placeholderPrefix" value="$QUERY{" />
</bean>
+ <bean id="siSettings"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location"
+ value="$NIMBUS_HOME/services/etc/nimbus/workspace-service/spotinstances.conf" />
+ <property name="placeholderPrefix"
+ value="$SI{" />
+ </bean>
+
</beans>
View
57 service/service/java/tests/suites/spotinstances/noresources/home/services/etc/nimbus/query/other/main.xml
@@ -49,11 +49,27 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
<property name="userDetailsService" ref="userDetailsService"/>
</bean>
-
- <bean id="userDetailsService" class="org.nimbustools.messaging.query.security.FileUserDetailsService">
- <constructor-arg value="$QUERY{query.usermap.path}"/>
+ <bean id="other.AuthzDataSource"
+ class="org.apache.commons.dbcp.BasicDataSource">
+ <property name="driverClassName" value="org.sqlite.JDBC" />
+ <property name="maxActive" value="10" />
+ <property name="maxIdle" value="4" />
+ <property name="maxWait" value="2000" />
+ <property name="poolPreparedStatements" value="true" />
+
+ <property name="url"
+ value="jdbc:sqlite://$CUMULUS{cumulus.authz.db}" />
+ <property name="username" value="nimbus"/>
+ <property name="password" value="nimbus"/>
+ </bean>
+
+ <bean id="authzDBAdapter" class="org.nimbus.authz.AuthzDBAdapter">
+ <constructor-arg ref="other.AuthzDataSource"/>
</bean>
+ <bean id="userDetailsService" class="org.nimbustools.messaging.query.security.NimbusAuthzUserDetailsService">
+ <property name="authzDBAdapter" ref="authzDBAdapter" />
+ </bean>
<bean id="elasticQuery" class="org.nimbustools.messaging.query.ElasticQuery">
<property name="versions">
@@ -91,6 +107,7 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
<constructor-arg ref="nimbus-query.rm.terminate" />
<constructor-arg ref="nimbus-query.rm.reboot" />
<constructor-arg ref="nimbus-query.rm.describe" />
+ <constructor-arg ref="nimbus-query.rm.requestSI" />
<constructor-arg ref="nimbus-query.rm.containerInterface" />
<constructor-arg ref="nimbus-query.rm.modulelocator" />
@@ -110,6 +127,21 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
</bean>
+ <bean id="nimbus-query.rm.requestSI"
+ class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.defaults.DefaultRequestSI">
+
+ <constructor-arg ref="nimbus-query.general.ra" />
+ <constructor-arg ref="nimbus-query.general.networks" />
+ <constructor-arg ref="nimbus-query.rm.idmappings" />
+ <constructor-arg ref="nimbus-query.rm.describe" />
+ <constructor-arg ref="nimbus-query.rm.containerInterface" />
+ <constructor-arg ref="nimbus-query.security.sshkeys" />
+ <constructor-arg ref="nimbus-query.image.repository" />
+ <constructor-arg ref="nimbus-query.rm.modulelocator" />
+
+ </bean>
+
+
<bean id="nimbus-query.rm.terminate"
class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.defaults.DefaultTerminate">
@@ -176,6 +208,7 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
<property name="largeName" value="$OTHER_ELASTIC{ra.name.large}" />
<property name="xlargeName" value="$OTHER_ELASTIC{ra.name.xlarge}" />
<property name="unknownString" value="$OTHER_ELASTIC{ra.name.unknown}" />
+ <property name="siType" value="$SI{si.instancetype}" />
<property name="cpuArch" value="$OTHER_ELASTIC{cpu.arch}" />
<property name="vmmType" value="$OTHER_ELASTIC{vmm.type}" />
@@ -254,20 +287,20 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
</bean>
- <bean id="nimbus-query.image.repository"
- class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.image.defaults.DefaultRepository"
+ <bean id="nimbus-query.image.repository"
+ class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.image.defaults.CumulusRepository"
init-method="validate">
<constructor-arg ref="nimbus-query.rm.containerInterface" />
- <constructor-arg ref="nimbus-query.rm.modulelocator" />
-
- <property name="baseDirectory" value="$ELASTIC{base.directory.url}" />
- <property name="scheme" value="$ELASTIC{propagation.method}" />
- <property name="rootFileMountAs" value="$OTHER_ELASTIC{rootfile.mountas}" />
+ <constructor-arg ref="nimbus-query.rm.modulelocator" />
+ <constructor-arg ref="other.AuthzDataSource" />
- <property name="enableListing" value="$ELASTIC{repository.listing.enabled}" />
- <property name="idAuthz" value="$ELASTIC{repository.idauthz}" />
+ <property name="repoBucket" value="$CUMULUS{cumulus.repo.bucket}" />
+ <property name="prefix" value="$CUMULUS{cumulus.repo.prefix}" />
+ <property name="cumulusHost" value="$CUMULUS{cumulus.host}" />
+ <property name="rootFileMountAs" value="$OTHER_ELASTIC{rootfile.mountas}" />
+
</bean>
View
7 ...s/suites/spotinstances/noresources/home/services/etc/nimbus/workspace-service/other/main.conflocator.xml
@@ -136,4 +136,11 @@
</bean>
+ <bean id="elasticSettings"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+
+ <property name="location" value="$NIMBUS_HOME/services/etc/nimbus/elastic/elastic.conf" />
+ <property name="placeholderPrefix" value="$ELASTIC{" />
+ </bean>
+
</beans>
View
4 ...ce/java/tests/suites/spotinstances/noresources/home/services/etc/nimbus/workspace-service/other/main.xml
@@ -558,7 +558,7 @@
<constructor-arg ref="nimbus-rm.loglevels" />
<constructor-arg ref="nimbus-rm.home.instance"/>
<constructor-arg ref="nimbus-rm.home.group"/>
- <constructor-arg value="$SI{si.basic.minprice}" />
+ <constructor-arg value="$SI{si.minprice}" />
<constructor-arg ref="nimbus-rm.si.pricingmodel" />
<!-- set after object creation time to avoid circular dep -->
@@ -570,7 +570,7 @@
<property name="maxUtilization"
value="$SI{async.policies.maxutilization}" />
<property name="instanceMem"
- value="$SI{si.basic.mem}" />
+ value="$ELASTIC{memory.$SI{si.instancetype}}" />
</bean>
View
21 ...ava/tests/suites/spotinstances/noresources/home/services/etc/nimbus/workspace-service/spotinstances.conf
@@ -61,15 +61,24 @@ si.pricingmodel=org.globus.workspace.async.pricingmodel.MaximizeUtilizationPrici
# BASIC SPOT INSTANCE CONFIGURATION:
####################################
-# Defines the amount of memory (in MegaBytes) that
-# a Spot Instance of the basic type has
+# Defines the instance type that will become
+# available as spot instances
+#
+# The supported instance types are:
+# small, large and xlarge.
+#
+# The amount of memory for each instance type
+# is defined in the elastic.conf file.
+#
+# Currently, Nimbus only supports one type
+# of Spot Instance type per site.
-si.basic.mem=128
+si.instancetype=small
# Defines the minimum price (in allocation units) per minute
-# that a Spot Instance of the basic type can cost
+# that a Spot Instance can cost
-si.basic.minprice=0.1
+si.minprice=0.1
#############################
@@ -115,4 +124,4 @@ async.policies.minreservedmem=256
#
# * reservedMem = (1 - maxUtilization)*usedMem/maxUtilization
-async.policies.maxutilization=0.7
+async.policies.maxutilization=0.7
View
2  ...service/java/tests/suites/spotinstances/singleresourcepool/home/services/etc/nimbus/elastic/elastic.conf
@@ -19,7 +19,7 @@ propagation.method=scp
# same as the cloud.properties memory value. Support for translating instance
# type requests into free space and number of CPUs is on its way.
-memory.small=2048
+memory.small=128
memory.large=2048
memory.xlarge=2048
View
22 ...ests/suites/spotinstances/singleresourcepool/home/services/etc/nimbus/elastic/other/main.conflocator.xml
@@ -28,6 +28,15 @@
<property name="placeholderPrefix" value="$COMMON{" />
</bean>
+ <bean id="cumulusSettings"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+
+ <!-- grab some shared settings from the workspace-service cumulus.conf file,
+ will have to adjust for other deployment scenarios -->
+ <property name="location" value="$NIMBUS_HOME/services/etc/nimbus/workspace-service/cumulus.conf" />
+ <property name="placeholderPrefix" value="$CUMULUS{" />
+ </bean>
+
<bean id="elasticSettings"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -42,16 +51,19 @@
<property name="placeholderPrefix" value="$OTHER_ELASTIC{" />
</bean>
- <bean id="querySettings"
+ <bean id="querySettings"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
<property name="location" value="$NIMBUS_HOME/services/etc/nimbus/query/query.conf" />
<property name="placeholderPrefix" value="$QUERY{" />
</bean>
- <bean id="restSettings"
+ <bean id="siSettings"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
- <property name="location" value="$NIMBUS_HOME/services/etc/nimbus/rest/rest.conf" />
- <property name="placeholderPrefix" value="$REST{" />
+
+ <property name="location"
+ value="$NIMBUS_HOME/services/etc/nimbus/workspace-service/spotinstances.conf" />
+ <property name="placeholderPrefix"
+ value="$SI{" />
</bean>
-</beans>
+</beans>
View
60 ...rvice/java/tests/suites/spotinstances/singleresourcepool/home/services/etc/nimbus/elastic/other/main.xml
@@ -18,6 +18,7 @@
<constructor-arg ref="nimbus-elastic.rm.terminate" />
<constructor-arg ref="nimbus-elastic.rm.reboot" />
<constructor-arg ref="nimbus-elastic.rm.describe" />
+ <constructor-arg ref="nimbus-elastic.rm.requestSI" />
<constructor-arg ref="nimbus-elastic.rm.containerInterface" />
<constructor-arg ref="nimbus-elastic.rm.modulelocator" />
@@ -37,6 +38,20 @@
</bean>
+ <bean id="nimbus-elastic.rm.requestSI"
+ class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.defaults.DefaultRequestSI">
+
+ <constructor-arg ref="nimbus-elastic.general.ra" />
+ <constructor-arg ref="nimbus-elastic.general.networks" />
+ <constructor-arg ref="nimbus-elastic.rm.idmappings" />
+ <constructor-arg ref="nimbus-elastic.rm.describe" />
+ <constructor-arg ref="nimbus-elastic.rm.containerInterface" />
+ <constructor-arg ref="nimbus-elastic.security.sshkeys" />
+ <constructor-arg ref="nimbus-elastic.image.repository" />
+ <constructor-arg ref="nimbus-elastic.rm.modulelocator" />
+
+ </bean>
+
<bean id="nimbus-elastic.rm.terminate"
class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.defaults.DefaultTerminate">
@@ -106,6 +121,7 @@
<property name="cpuArch" value="$OTHER_ELASTIC{cpu.arch}" />
<property name="vmmType" value="$OTHER_ELASTIC{vmm.type}" />
<property name="vmmVersion" value="$OTHER_ELASTIC{vmm.version}" />
+ <property name="siType" value="$SI{si.instancetype}" />
</bean>
@@ -180,6 +196,7 @@
</bean>
+ <!--
<bean id="nimbus-elastic.image.repository"
class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.image.defaults.DefaultRepository"
init-method="validate">
@@ -195,7 +212,36 @@
<property name="idAuthz" value="$ELASTIC{repository.idauthz}" />
</bean>
-
+ -->
+ <bean id="other.AuthzDataSource"
+ class="org.apache.commons.dbcp.BasicDataSource">
+ <property name="driverClassName" value="org.sqlite.JDBC" />
+ <property name="maxActive" value="10" />
+ <property name="maxIdle" value="4" />
+ <property name="maxWait" value="2000" />
+ <property name="poolPreparedStatements" value="true" />
+
+ <property name="url"
+ value="jdbc:sqlite://$CUMULUS{cumulus.authz.db}" />
+ <property name="username" value="nimbus"/>
+ <property name="password" value="nimbus"/>
+ </bean>
+
+ <bean id="nimbus-elastic.image.repository"
+ class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.image.defaults.CumulusRepository"
+ init-method="validate">
+
+ <constructor-arg ref="nimbus-elastic.rm.containerInterface" />
+ <constructor-arg ref="nimbus-elastic.rm.modulelocator" />
+ <constructor-arg ref="other.AuthzDataSource" />
+
+ <property name="repoBucket" value="$CUMULUS{cumulus.repo.bucket}" />
+ <property name="prefix" value="$CUMULUS{cumulus.repo.prefix}" />
+ <property name="cumulusHost" value="$CUMULUS{cumulus.host}" />
+ <property name="rootFileMountAs" value="$OTHER_ELASTIC{rootfile.mountas}" />
+
+ </bean>
+
<bean id="nimbus-query.httpserver"
class="org.nimbustools.messaging.query.HttpQuery"
init-method="startListening">
@@ -208,18 +254,6 @@
<property name="springConfigResource" value="$QUERY{query.spring.path}"/>
</bean>
- <!-- TODO this should happen somewhere else... -->
- <bean id="nimbus-rest.httpserver"
- class="org.nimbustools.messaging.rest.RestHttp"
- init-method="startListening">
- <property name="enabled" value="$REST{rest.enabled}" />
- <property name="port" value="$REST{rest.port}" />
- <property name="keystoreResource" value="$REST{keystore.path}"/>
- <property name="keystorePassword" value="$REST{keystore.password}"/>
- <property name="springConfigResource" value="$REST{rest.spring.path}"/>
- </bean>
-
-
<!--
property sources are concentrated in this file
-->
View
17 .../tests/suites/spotinstances/singleresourcepool/home/services/etc/nimbus/query/other/main.conflocator.xml
@@ -28,6 +28,15 @@
<property name="placeholderPrefix" value="$COMMON{" />
</bean>
+ <bean id="cumulusSettings"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+
+ <!-- grab some shared settings from the workspace-service cumulus.conf file,
+ will have to adjust for other deployment scenarios -->
+ <property name="location" value="$NIMBUS_HOME/services/etc/nimbus/workspace-service/cumulus.conf" />
+ <property name="placeholderPrefix" value="$CUMULUS{" />
+ </bean>
+
<bean id="elasticSettings"
class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
@@ -48,4 +57,12 @@
<property name="placeholderPrefix" value="$QUERY{" />
</bean>
+ <bean id="siSettings"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+ <property name="location"
+ value="$NIMBUS_HOME/services/etc/nimbus/workspace-service/spotinstances.conf" />
+ <property name="placeholderPrefix"
+ value="$SI{" />
+ </bean>
+
</beans>
View
57 ...service/java/tests/suites/spotinstances/singleresourcepool/home/services/etc/nimbus/query/other/main.xml
@@ -49,11 +49,27 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
<property name="userDetailsService" ref="userDetailsService"/>
</bean>
-
- <bean id="userDetailsService" class="org.nimbustools.messaging.query.security.FileUserDetailsService">
- <constructor-arg value="$QUERY{query.usermap.path}"/>
+ <bean id="other.AuthzDataSource"
+ class="org.apache.commons.dbcp.BasicDataSource">
+ <property name="driverClassName" value="org.sqlite.JDBC" />
+ <property name="maxActive" value="10" />
+ <property name="maxIdle" value="4" />
+ <property name="maxWait" value="2000" />
+ <property name="poolPreparedStatements" value="true" />
+
+ <property name="url"
+ value="jdbc:sqlite://$CUMULUS{cumulus.authz.db}" />
+ <property name="username" value="nimbus"/>
+ <property name="password" value="nimbus"/>
+ </bean>
+
+ <bean id="authzDBAdapter" class="org.nimbus.authz.AuthzDBAdapter">
+ <constructor-arg ref="other.AuthzDataSource"/>
</bean>
+ <bean id="userDetailsService" class="org.nimbustools.messaging.query.security.NimbusAuthzUserDetailsService">
+ <property name="authzDBAdapter" ref="authzDBAdapter" />
+ </bean>
<bean id="elasticQuery" class="org.nimbustools.messaging.query.ElasticQuery">
<property name="versions">
@@ -91,6 +107,7 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
<constructor-arg ref="nimbus-query.rm.terminate" />
<constructor-arg ref="nimbus-query.rm.reboot" />
<constructor-arg ref="nimbus-query.rm.describe" />
+ <constructor-arg ref="nimbus-query.rm.requestSI" />
<constructor-arg ref="nimbus-query.rm.containerInterface" />
<constructor-arg ref="nimbus-query.rm.modulelocator" />
@@ -110,6 +127,21 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
</bean>
+ <bean id="nimbus-query.rm.requestSI"
+ class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.defaults.DefaultRequestSI">
+
+ <constructor-arg ref="nimbus-query.general.ra" />
+ <constructor-arg ref="nimbus-query.general.networks" />
+ <constructor-arg ref="nimbus-query.rm.idmappings" />
+ <constructor-arg ref="nimbus-query.rm.describe" />
+ <constructor-arg ref="nimbus-query.rm.containerInterface" />
+ <constructor-arg ref="nimbus-query.security.sshkeys" />
+ <constructor-arg ref="nimbus-query.image.repository" />
+ <constructor-arg ref="nimbus-query.rm.modulelocator" />
+
+ </bean>
+
+
<bean id="nimbus-query.rm.terminate"
class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.rm.defaults.DefaultTerminate">
@@ -176,6 +208,7 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
<property name="largeName" value="$OTHER_ELASTIC{ra.name.large}" />
<property name="xlargeName" value="$OTHER_ELASTIC{ra.name.xlarge}" />
<property name="unknownString" value="$OTHER_ELASTIC{ra.name.unknown}" />
+ <property name="siType" value="$SI{si.instancetype}" />
<property name="cpuArch" value="$OTHER_ELASTIC{cpu.arch}" />
<property name="vmmType" value="$OTHER_ELASTIC{vmm.type}" />
@@ -254,20 +287,20 @@ http://cxf.apache.org/schemas/jaxrs.xsd">
</bean>
- <bean id="nimbus-query.image.repository"
- class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.image.defaults.DefaultRepository"
+ <bean id="nimbus-query.image.repository"
+ class="org.nimbustools.messaging.gt4_0_elastic.v2008_05_05.image.defaults.CumulusRepository"
init-method="validate">
<constructor-arg ref="nimbus-query.rm.containerInterface" />
- <constructor-arg ref="nimbus-query.rm.modulelocator" />
-
- <property name="baseDirectory" value="$ELASTIC{base.directory.url}" />
- <property name="scheme" value="$ELASTIC{propagation.method}" />
- <property name="rootFileMountAs" value="$OTHER_ELASTIC{rootfile.mountas}" />
+ <constructor-arg ref="nimbus-query.rm.modulelocator" />
+ <constructor-arg ref="other.AuthzDataSource" />
- <property name="enableListing" value="$ELASTIC{repository.listing.enabled}" />
- <property name="idAuthz" value="$ELASTIC{repository.idauthz}" />
+ <property name="repoBucket" value="$CUMULUS{cumulus.repo.bucket}" />
+ <property name="prefix" value="$CUMULUS{cumulus.repo.prefix}" />
+ <property name="cumulusHost" value="$CUMULUS{cumulus.host}" />
+ <property name="rootFileMountAs" value="$OTHER_ELASTIC{rootfile.mountas}" />
+
</bean>
View
7 ...s/spotinstances/singleresourcepool/home/services/etc/nimbus/workspace-service/other/main.conflocator.xml
@@ -136,4 +136,11 @@
</bean>
+ <bean id="elasticSettings"
+ class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+
+ <property name="location" value="$NIMBUS_HOME/services/etc/nimbus/elastic/elastic.conf" />
+ <property name="placeholderPrefix" value="$ELASTIC{" />
+ </bean>
+
</beans>
View
4 .../tests/suites/spotinstances/singleresourcepool/home/services/etc/nimbus/workspace-service/other/main.xml
@@ -558,7 +558,7 @@
<constructor-arg ref="nimbus-rm.loglevels" />
<constructor-arg ref="nimbus-rm.home.instance"/>
<constructor-arg ref="nimbus-rm.home.group"/>
- <constructor-arg value="$SI{si.basic.minprice}" />
+ <constructor-arg value="$SI{si.minprice}" />
<constructor-arg ref="nimbus-rm.si.pricingmodel" />
<!-- set after object creation time to avoid circular dep -->
@@ -570,7 +570,7 @@
<property name="maxUtilization"
value="$SI{async.policies.maxutilization}" />
<property name="instanceMem"
- value="$SI{si.basic.mem}" />
+ value="$ELASTIC{memory.$SI{si.instancetype}}" />
</bean>
View
21 ...ts/suites/spotinstances/singleresourcepool/home/services/etc/nimbus/workspace-service/spotinstances.conf
@@ -61,15 +61,24 @@ si.pricingmodel=org.globus.workspace.async.pricingmodel.MaximizeUtilizationPrici
# BASIC SPOT INSTANCE CONFIGURATION:
####################################
-# Defines the amount of memory (in MegaBytes) that
-# a Spot Instance of the basic type has
+# Defines the instance type that will become
+# available as spot instances
+#
+# The supported instance types are:
+# small, large and xlarge.
+#
+# The amount of memory for each instance type
+# is defined in the elastic.conf file.
+#
+# Currently, Nimbus only supports one type
+# of Spot Instance type per site.
-si.basic.mem=128
+si.instancetype=small
# Defines the minimum price (in allocation units) per minute
-# that a Spot Instance of the basic type can cost
+# that a Spot Instance can cost
-si.basic.minprice=0.1
+si.minprice=0.1
#############################
@@ -115,4 +124,4 @@ async.policies.minreservedmem=256
#
# * reservedMem = (1 - maxUtilization)*usedMem/maxUtilization
-async.policies.maxutilization=0.7
+async.policies.maxutilization=0.7
View
10 ...tests/suites/spotinstances/src/org/globus/workspace/testing/suites/spotinstances/NoResourcesSISuite.java
@@ -97,12 +97,12 @@ public void singleRequest() throws Exception {
//Cancel request
SpotRequestInfo[] cancelledReqs = rm.cancelSpotInstanceRequests(new String[]{result.getRequestID()}, caller);
assertEquals(1, cancelledReqs.length);
- assertEquals(RequestState.STATE_Cancelled, cancelledReqs[0].getState().getStateStr());
+ assertEquals(RequestState.STATE_Canceled, cancelledReqs[0].getState().getStateStr());
assertEquals(result.getRequestID(), cancelledReqs[0].getRequestID());
//Check if request was really cancelled
SpotRequestInfo request = rm.getSpotRequest(result.getRequestID(), caller);
- assertEquals(RequestState.STATE_Cancelled, request.getState().getStateStr());
+ assertEquals(RequestState.STATE_Canceled, request.getState().getStateStr());
}
/**
@@ -154,9 +154,9 @@ public void multipleRequests() throws Exception {
SpotRequestInfo[] cancelledReqs = rm.cancelSpotInstanceRequests(new String[]{result2.getRequestID()}, caller2);
//Check if requests were really cancelled
- assertEquals(RequestState.STATE_Cancelled, cancelledReqs[0].getState().getStateStr());
+ assertEquals(RequestState.STATE_Canceled, cancelledReqs[0].getState().getStateStr());
spotRequestByCaller1 = rm.getSpotRequestsByCaller(caller1);
- assertEquals(RequestState.STATE_Cancelled, spotRequestByCaller1[0].getState().getStateStr());
- assertEquals(RequestState.STATE_Cancelled, spotRequestByCaller1[1].getState().getStateStr());
+ assertEquals(RequestState.STATE_Canceled, spotRequestByCaller1[0].getState().getStateStr());
+ assertEquals(RequestState.STATE_Canceled, spotRequestByCaller1[1].getState().getStateStr());
}
}
View
20 ...uites/spotinstances/src/org/globus/workspace/testing/suites/spotinstances/SingleResourcePoolSISuite.java
@@ -202,7 +202,7 @@ public void singleRequest() throws Exception {
SpotRequestInfo[] cancelledReqs = rm.cancelSpotInstanceRequests(new String[]{result.getRequestID()}, caller);
assertEquals(1, cancelledReqs.length);
- assertEquals(RequestState.STATE_Cancelled, cancelledReqs[0].getState().getStateStr());
+ assertEquals(RequestState.STATE_Canceled, cancelledReqs[0].getState().getStateStr());
assertEquals(result.getRequestID(), cancelledReqs[0].getRequestID());
// Spot Instances Snapshot
@@ -233,20 +233,20 @@ public void singleRequest() throws Exception {
//Check if request was really cancelled
request = rm.getSpotRequest(result.getRequestID(), caller);
- assertEquals(RequestState.STATE_Cancelled, request.getState().getStateStr());
+ assertEquals(RequestState.STATE_Canceled, request.getState().getStateStr());
assertEquals(0, request.getVMIds().length);
logger.debug("Cancelling backfill request.");
RequestInfo[] cancelledBackfillReqs = rm.cancelBackfillRequests(new String[]{backfillResult.getRequestID()}, superuser);
assertEquals(1, cancelledBackfillReqs.length);
- assertEquals(RequestState.STATE_Cancelled, cancelledBackfillReqs[0].getState().getStateStr());
+ assertEquals(RequestState.STATE_Canceled, cancelledBackfillReqs[0].getState().getStateStr());
assertEquals(backfillResult.getRequestID(), cancelledBackfillReqs[0].getRequestID());
//Check backfill request state
RequestInfo backfillReq = rm.getBackfillRequest(backfillResult.getRequestID(), superuser);
assertEquals(0, backfillReq.getVMIds().length);
- assertEquals(RequestState.STATE_Cancelled, backfillReq.getState().getStateStr());
+ assertEquals(RequestState.STATE_Canceled, backfillReq.getState().getStateStr());
Double[] prices = {MINIMUM_PRICE};
@@ -640,8 +640,8 @@ public void multipleSIRequestsOnly() throws Exception {
assertEquals(MINIMUM_PRICE, rm.getSpotPrice());
//Check if requests were cancelled
- assertEquals(RequestState.STATE_Cancelled, rm.getSpotRequest(highReqId, caller3).getState().getStateStr());
- assertEquals(RequestState.STATE_Cancelled, rm.getSpotRequest(lowReq2Id, caller1).getState().getStateStr());
+ assertEquals(RequestState.STATE_Canceled, rm.getSpotRequest(highReqId, caller3).getState().getStateStr());
+ assertEquals(RequestState.STATE_Canceled, rm.getSpotRequest(lowReq2Id, caller1).getState().getStateStr());
//Check if persistent request is active
SpotRequestInfo medReq2 = rm.getSpotRequest(medReq2Id, caller2);
@@ -699,7 +699,7 @@ public void multipleSIRequestsOnly() throws Exception {
backfill1Result = rm.getBackfillRequest(backfill1Result.getRequestID(), superuser);
assertEquals(0, backfill1Result.getVMIds().length);
- assertEquals(RequestState.STATE_Cancelled, backfill1Result.getState().getStateStr());
+ assertEquals(RequestState.STATE_Canceled, backfill1Result.getState().getStateStr());
backfill2Result = rm.getBackfillRequest(backfill2Result.getRequestID(), superuser);
assertEquals(3, backfill2Result.getVMIds().length);
@@ -735,7 +735,7 @@ public void multipleSIRequestsOnly() throws Exception {
//Check if persistent request was cancelled
medReq2 = rm.getSpotRequest(medReq2Id, caller2);
- assertEquals(RequestState.STATE_Cancelled, medReq2.getState().getStateStr());
+ assertEquals(RequestState.STATE_Canceled, medReq2.getState().getStateStr());
assertEquals(0, medReq2.getVMIds().length);
//Check backfill request state
@@ -744,7 +744,7 @@ public void multipleSIRequestsOnly() throws Exception {
backfill1Result = rm.getBackfillRequest(backfill1Result.getRequestID(), superuser);
assertEquals(0, backfill1Result.getVMIds().length);
- assertEquals(RequestState.STATE_Cancelled, backfill1Result.getState().getStateStr());
+ assertEquals(RequestState.STATE_Canceled, backfill1Result.getState().getStateStr());
backfill2Result = rm.getBackfillRequest(backfill2Result.getRequestID(), superuser);
assertEquals(5, backfill2Result.getVMIds().length);
@@ -1367,7 +1367,7 @@ public void mixedSIandWSrequests() throws Exception {
assertEquals(0, medReq2SR.getVMIds().length);
highReqSR = rm.getSpotRequest(highReq1Id, siCaller);
- assertEquals(RequestState.STATE_Cancelled, highReqSR.getState().getStateStr());
+ assertEquals(RequestState.STATE_Canceled, highReqSR.getState().getStateStr());
assertEquals(0, highReqSR.getVMIds().length);
logger.debug("Destroying remaining WS VMs.");
Please sign in to comment.
Something went wrong with that request. Please try again.