diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8736e5bac94..3d0410f3dec 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -59,7 +59,7 @@ repos: - id: mixed-line-ending exclude: \.(cs|xml)$ - id: trailing-whitespace - files: \.(header|in|java|md|properties|py|rb|sh|sql|txt|vue|yaml|yml)$ + files: \.(header|in|java|md|properties|py|rb|sh|sql|txt|vue|xml|yaml|yml)$ args: [--markdown-linebreak-ext=md] exclude: ^services/console-proxy/rdpconsole/src/test/doc/freerdp-debug-log\.txt$ - repo: https://github.com/pycqa/flake8 diff --git a/api/src/main/resources/META-INF/cloudstack/api-config/spring-api-config-context.xml b/api/src/main/resources/META-INF/cloudstack/api-config/spring-api-config-context.xml index 5ea32464ee9..12d3c2361ac 100644 --- a/api/src/main/resources/META-INF/cloudstack/api-config/spring-api-config-context.xml +++ b/api/src/main/resources/META-INF/cloudstack/api-config/spring-api-config-context.xml @@ -28,5 +28,5 @@ > - + diff --git a/api/src/main/resources/META-INF/cloudstack/api-planner/spring-api-planner-context.xml b/api/src/main/resources/META-INF/cloudstack/api-planner/spring-api-planner-context.xml index 8523daf1d21..b614e362950 100644 --- a/api/src/main/resources/META-INF/cloudstack/api-planner/spring-api-planner-context.xml +++ b/api/src/main/resources/META-INF/cloudstack/api-planner/spring-api-planner-context.xml @@ -30,5 +30,5 @@ - + diff --git a/client/src/main/resources/META-INF/cloudstack/webApplicationContext.xml b/client/src/main/resources/META-INF/cloudstack/webApplicationContext.xml index 3b3c6dbe35c..e1c46268618 100644 --- a/client/src/main/resources/META-INF/cloudstack/webApplicationContext.xml +++ b/client/src/main/resources/META-INF/cloudstack/webApplicationContext.xml @@ -25,7 +25,7 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd" - > + > diff --git a/core/src/main/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml b/core/src/main/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml index a0d1b4cfd43..9f04a7fb618 100644 --- a/core/src/main/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml +++ b/core/src/main/resources/META-INF/cloudstack/allocator/spring-core-allocator-context.xml @@ -27,7 +27,7 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd" - > + > diff --git a/core/src/main/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml b/core/src/main/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml index ec3bb63aeb6..6d05f858303 100644 --- a/core/src/main/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml +++ b/core/src/main/resources/META-INF/cloudstack/allocator/spring-core-lifecycle-allocator-context-inheritable.xml @@ -27,7 +27,7 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd" - > + > diff --git a/core/src/main/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml b/core/src/main/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml index 91a35f18a89..995ed30eb5e 100644 --- a/core/src/main/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml +++ b/core/src/main/resources/META-INF/cloudstack/api/spring-core-lifecycle-api-context-inheritable.xml @@ -62,12 +62,12 @@ - + - + diff --git a/core/src/main/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml b/core/src/main/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml index 732f36534d2..84d1b80b3b6 100644 --- a/core/src/main/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml +++ b/core/src/main/resources/META-INF/cloudstack/core/spring-core-registry-core-context.xml @@ -262,7 +262,7 @@ - + @@ -276,11 +276,11 @@ class="org.apache.cloudstack.spring.lifecycle.registry.ExtensionRegistry"> - + - + diff --git a/core/src/main/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml b/core/src/main/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml index 2240d1f2606..e5c232267ae 100644 --- a/core/src/main/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml +++ b/core/src/main/resources/META-INF/cloudstack/network/spring-core-lifecycle-network-context-inheritable.xml @@ -92,7 +92,7 @@ - + - + - - + + diff --git a/core/src/main/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml b/core/src/main/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml index 4a59e95de35..89442fc12b4 100644 --- a/core/src/main/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml +++ b/core/src/main/resources/META-INF/cloudstack/system/spring-core-system-context-inheritable.xml @@ -27,7 +27,7 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd" - > + > @@ -44,8 +44,8 @@ - - diff --git a/engine/api/src/main/resources/META-INF/cloudstack/core/spring-engine-api-core-context.xml b/engine/api/src/main/resources/META-INF/cloudstack/core/spring-engine-api-core-context.xml index 021336771f1..b91fa639da0 100644 --- a/engine/api/src/main/resources/META-INF/cloudstack/core/spring-engine-api-core-context.xml +++ b/engine/api/src/main/resources/META-INF/cloudstack/core/spring-engine-api-core-context.xml @@ -40,5 +40,5 @@ - + diff --git a/engine/orchestration/src/main/resources/META-INF/cloudstack/core/spring-engine-orchestration-core-context.xml b/engine/orchestration/src/main/resources/META-INF/cloudstack/core/spring-engine-orchestration-core-context.xml index 66335a6b057..17c5002c718 100644 --- a/engine/orchestration/src/main/resources/META-INF/cloudstack/core/spring-engine-orchestration-core-context.xml +++ b/engine/orchestration/src/main/resources/META-INF/cloudstack/core/spring-engine-orchestration-core-context.xml @@ -21,10 +21,10 @@ xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:util="http://www.springframework.org/schema/util" - + xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/aop + http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd @@ -70,15 +70,15 @@ class="org.apache.cloudstack.engine.orchestration.CloudOrchestrator" /> - + - + - + - + @@ -96,5 +96,5 @@ - + diff --git a/engine/storage/cache/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-cache-core-context.xml b/engine/storage/cache/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-cache-core-context.xml index f98b06da2a8..2038cfac945 100644 --- a/engine/storage/cache/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-cache-core-context.xml +++ b/engine/storage/cache/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-cache-core-context.xml @@ -34,5 +34,5 @@ - + diff --git a/engine/storage/integration-test/src/test/resources/component.xml b/engine/storage/integration-test/src/test/resources/component.xml index d384d546665..608326d1279 100644 --- a/engine/storage/integration-test/src/test/resources/component.xml +++ b/engine/storage/integration-test/src/test/resources/component.xml @@ -17,13 +17,13 @@ under the License. --> - + - + @@ -47,15 +47,15 @@ - - + + - + @@ -74,7 +74,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -138,8 +138,8 @@ - - + + @@ -179,11 +179,11 @@ - + - + diff --git a/engine/storage/integration-test/src/test/resources/s3_testng.xml b/engine/storage/integration-test/src/test/resources/s3_testng.xml index c46e5a2db04..8beb598ee00 100644 --- a/engine/storage/integration-test/src/test/resources/s3_testng.xml +++ b/engine/storage/integration-test/src/test/resources/s3_testng.xml @@ -28,17 +28,17 @@ - + - + - + diff --git a/engine/storage/integration-test/src/test/resources/storageContext.xml b/engine/storage/integration-test/src/test/resources/storageContext.xml index 7c95345f673..f38e718ea41 100644 --- a/engine/storage/integration-test/src/test/resources/storageContext.xml +++ b/engine/storage/integration-test/src/test/resources/storageContext.xml @@ -1,27 +1,27 @@ - - + @@ -36,10 +36,10 @@ - - - - + + + + @@ -56,7 +56,7 @@ - + diff --git a/engine/storage/integration-test/src/test/resources/testng.xml b/engine/storage/integration-test/src/test/resources/testng.xml index fb4330999f3..34ef6defcd9 100644 --- a/engine/storage/integration-test/src/test/resources/testng.xml +++ b/engine/storage/integration-test/src/test/resources/testng.xml @@ -27,10 +27,10 @@ - + - + @@ -40,11 +40,11 @@ - + - + diff --git a/engine/storage/object/src/test/resource/testContext.xml b/engine/storage/object/src/test/resource/testContext.xml index 7352b1148f7..c168582bab8 100644 --- a/engine/storage/object/src/test/resource/testContext.xml +++ b/engine/storage/object/src/test/resource/testContext.xml @@ -22,7 +22,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/tx + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd @@ -38,7 +38,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -68,12 +68,12 @@ - + - + diff --git a/engine/storage/snapshot/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-snapshot-core-context.xml b/engine/storage/snapshot/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-snapshot-core-context.xml index 1d1c831a7b0..cd64cedb7b2 100644 --- a/engine/storage/snapshot/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-snapshot-core-context.xml +++ b/engine/storage/snapshot/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-snapshot-core-context.xml @@ -35,5 +35,5 @@ - + diff --git a/engine/storage/snapshot/src/main/resources/META-INF/cloudstack/storage/spring-engine-storage-snapshot-storage-context.xml b/engine/storage/snapshot/src/main/resources/META-INF/cloudstack/storage/spring-engine-storage-snapshot-storage-context.xml index 56c6fff63e0..fc561159c8e 100644 --- a/engine/storage/snapshot/src/main/resources/META-INF/cloudstack/storage/spring-engine-storage-snapshot-storage-context.xml +++ b/engine/storage/snapshot/src/main/resources/META-INF/cloudstack/storage/spring-engine-storage-snapshot-storage-context.xml @@ -32,7 +32,7 @@ - + diff --git a/engine/storage/snapshot/src/test/resources/SnapshotManagerTestContext.xml b/engine/storage/snapshot/src/test/resources/SnapshotManagerTestContext.xml index a06ba6a3b9a..b0aa3956f02 100644 --- a/engine/storage/snapshot/src/test/resources/SnapshotManagerTestContext.xml +++ b/engine/storage/snapshot/src/test/resources/SnapshotManagerTestContext.xml @@ -1,19 +1,19 @@ - - + - + - + diff --git a/engine/storage/src/main/resources/META-INF/cloudstack/storage-allocator/spring-engine-storage-storage-allocator-context.xml b/engine/storage/src/main/resources/META-INF/cloudstack/storage-allocator/spring-engine-storage-storage-allocator-context.xml index 783c98aacbe..e68d2c67309 100644 --- a/engine/storage/src/main/resources/META-INF/cloudstack/storage-allocator/spring-engine-storage-storage-allocator-context.xml +++ b/engine/storage/src/main/resources/META-INF/cloudstack/storage-allocator/spring-engine-storage-storage-allocator-context.xml @@ -31,7 +31,7 @@ class="org.apache.cloudstack.storage.allocator.LocalStoragePoolAllocator"> - + - + diff --git a/engine/storage/volume/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-volume-core-context.xml b/engine/storage/volume/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-volume-core-context.xml index a0cb6a78e91..57cb7f191ff 100644 --- a/engine/storage/volume/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-volume-core-context.xml +++ b/engine/storage/volume/src/main/resources/META-INF/cloudstack/core/spring-engine-storage-volume-core-context.xml @@ -45,5 +45,5 @@ - + diff --git a/engine/storage/volume/src/test/resource/testContext.xml b/engine/storage/volume/src/test/resource/testContext.xml index 7352b1148f7..c168582bab8 100644 --- a/engine/storage/volume/src/test/resource/testContext.xml +++ b/engine/storage/volume/src/test/resource/testContext.xml @@ -22,7 +22,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/tx + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd @@ -38,7 +38,7 @@ - + @@ -49,7 +49,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -68,12 +68,12 @@ - + - + diff --git a/engine/userdata/src/main/resources/META-INF/cloudstack/core/spring-engine-userdata-core-context.xml b/engine/userdata/src/main/resources/META-INF/cloudstack/core/spring-engine-userdata-core-context.xml index 0d4c6474be1..b3a587ee594 100644 --- a/engine/userdata/src/main/resources/META-INF/cloudstack/core/spring-engine-userdata-core-context.xml +++ b/engine/userdata/src/main/resources/META-INF/cloudstack/core/spring-engine-userdata-core-context.xml @@ -30,5 +30,5 @@ - + diff --git a/framework/cluster/src/main/resources/META-INF/cloudstack/core/spring-framework-cluster-core-context.xml b/framework/cluster/src/main/resources/META-INF/cloudstack/core/spring-framework-cluster-core-context.xml index 539c9e9164f..ddb40d07626 100644 --- a/framework/cluster/src/main/resources/META-INF/cloudstack/core/spring-framework-cluster-core-context.xml +++ b/framework/cluster/src/main/resources/META-INF/cloudstack/core/spring-framework-cluster-core-context.xml @@ -28,9 +28,9 @@ > - + - + - + diff --git a/framework/config/src/main/resources/META-INF/cloudstack/system/spring-framework-config-system-context-inheritable.xml b/framework/config/src/main/resources/META-INF/cloudstack/system/spring-framework-config-system-context-inheritable.xml index e176ec5a88b..0148fa7acc6 100644 --- a/framework/config/src/main/resources/META-INF/cloudstack/system/spring-framework-config-system-context-inheritable.xml +++ b/framework/config/src/main/resources/META-INF/cloudstack/system/spring-framework-config-system-context-inheritable.xml @@ -25,13 +25,13 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd" - > + > - + diff --git a/framework/db/src/main/resources/META-INF/cloudstack/system/spring-framework-db-system-context.xml b/framework/db/src/main/resources/META-INF/cloudstack/system/spring-framework-db-system-context.xml index f532a5cdc6c..84f81f3b191 100644 --- a/framework/db/src/main/resources/META-INF/cloudstack/system/spring-framework-db-system-context.xml +++ b/framework/db/src/main/resources/META-INF/cloudstack/system/spring-framework-db-system-context.xml @@ -28,5 +28,5 @@ > - + diff --git a/framework/ipc/src/main/resources/META-INF/cloudstack/core/spring-framework-ipc-core-context.xml b/framework/ipc/src/main/resources/META-INF/cloudstack/core/spring-framework-ipc-core-context.xml index 926a84a33ad..9c9df4f579f 100644 --- a/framework/ipc/src/main/resources/META-INF/cloudstack/core/spring-framework-ipc-core-context.xml +++ b/framework/ipc/src/main/resources/META-INF/cloudstack/core/spring-framework-ipc-core-context.xml @@ -25,7 +25,7 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd" - > + > @@ -47,5 +47,5 @@ - + diff --git a/framework/ipc/src/test/resources/SampleManagementServerAppContext.xml b/framework/ipc/src/test/resources/SampleManagementServerAppContext.xml index fb21f2c2f50..f6afd1620f8 100644 --- a/framework/ipc/src/test/resources/SampleManagementServerAppContext.xml +++ b/framework/ipc/src/test/resources/SampleManagementServerAppContext.xml @@ -18,13 +18,13 @@ under the License. --> @@ -51,12 +51,12 @@ - + - + diff --git a/framework/jobs/src/test/resources/AsyncJobManagerTestContext.xml b/framework/jobs/src/test/resources/AsyncJobManagerTestContext.xml index 4e5d7675877..e838c8da34d 100644 --- a/framework/jobs/src/test/resources/AsyncJobManagerTestContext.xml +++ b/framework/jobs/src/test/resources/AsyncJobManagerTestContext.xml @@ -22,7 +22,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/tx + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd @@ -34,5 +34,5 @@ class="org.apache.cloudstack.framework.jobs.AsyncJobManagerTestConfiguration" /> - + diff --git a/framework/jobs/src/test/resources/commonContext.xml b/framework/jobs/src/test/resources/commonContext.xml index 80d57f1d5f8..b19bd755b48 100644 --- a/framework/jobs/src/test/resources/commonContext.xml +++ b/framework/jobs/src/test/resources/commonContext.xml @@ -1,19 +1,19 @@ - - + diff --git a/framework/spring/module/src/test/resources/testhierarchy/base/test-context.xml b/framework/spring/module/src/test/resources/testhierarchy/base/test-context.xml index b79711e1f53..a6342820b46 100644 --- a/framework/spring/module/src/test/resources/testhierarchy/base/test-context.xml +++ b/framework/spring/module/src/test/resources/testhierarchy/base/test-context.xml @@ -26,9 +26,9 @@ - + - + diff --git a/framework/spring/module/src/test/resources/testhierarchy/child1-1/test-context.xml b/framework/spring/module/src/test/resources/testhierarchy/child1-1/test-context.xml index 4e8f2db8f9e..9c63227162f 100644 --- a/framework/spring/module/src/test/resources/testhierarchy/child1-1/test-context.xml +++ b/framework/spring/module/src/test/resources/testhierarchy/child1-1/test-context.xml @@ -26,9 +26,9 @@ - + - + diff --git a/framework/spring/module/src/test/resources/testhierarchy/child1/test-context-override.xml b/framework/spring/module/src/test/resources/testhierarchy/child1/test-context-override.xml index 0ea8893100f..59820de453c 100644 --- a/framework/spring/module/src/test/resources/testhierarchy/child1/test-context-override.xml +++ b/framework/spring/module/src/test/resources/testhierarchy/child1/test-context-override.xml @@ -22,9 +22,9 @@ http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> - + - + diff --git a/framework/spring/module/src/test/resources/testhierarchy/child1/test-context.xml b/framework/spring/module/src/test/resources/testhierarchy/child1/test-context.xml index 98b663ebf84..ecaef681bef 100644 --- a/framework/spring/module/src/test/resources/testhierarchy/child1/test-context.xml +++ b/framework/spring/module/src/test/resources/testhierarchy/child1/test-context.xml @@ -28,11 +28,11 @@ - + - + - + diff --git a/framework/spring/module/src/test/resources/testhierarchy/child2/test-context.xml b/framework/spring/module/src/test/resources/testhierarchy/child2/test-context.xml index 1c4404649eb..e3577b52f28 100644 --- a/framework/spring/module/src/test/resources/testhierarchy/child2/test-context.xml +++ b/framework/spring/module/src/test/resources/testhierarchy/child2/test-context.xml @@ -26,7 +26,7 @@ - + diff --git a/framework/spring/module/src/test/resources/testhierarchy/excluded/test-context.xml b/framework/spring/module/src/test/resources/testhierarchy/excluded/test-context.xml index 2cd049c88bf..7d069ff61ad 100644 --- a/framework/spring/module/src/test/resources/testhierarchy/excluded/test-context.xml +++ b/framework/spring/module/src/test/resources/testhierarchy/excluded/test-context.xml @@ -26,7 +26,7 @@ - + diff --git a/framework/spring/module/src/test/resources/testhierarchy/excluded2/test-context.xml b/framework/spring/module/src/test/resources/testhierarchy/excluded2/test-context.xml index 192a376e9a9..aaff5b4ed1e 100644 --- a/framework/spring/module/src/test/resources/testhierarchy/excluded2/test-context.xml +++ b/framework/spring/module/src/test/resources/testhierarchy/excluded2/test-context.xml @@ -26,7 +26,7 @@ - + diff --git a/framework/spring/module/src/test/resources/testhierarchy/orphan-of-excluded/test-context.xml b/framework/spring/module/src/test/resources/testhierarchy/orphan-of-excluded/test-context.xml index 08bd33c52bf..7000fb436f3 100644 --- a/framework/spring/module/src/test/resources/testhierarchy/orphan-of-excluded/test-context.xml +++ b/framework/spring/module/src/test/resources/testhierarchy/orphan-of-excluded/test-context.xml @@ -26,7 +26,7 @@ - + diff --git a/framework/spring/module/src/test/resources/testhierarchy/orphan1/test-context.xml b/framework/spring/module/src/test/resources/testhierarchy/orphan1/test-context.xml index 38e0e326f37..d422ecdd79c 100644 --- a/framework/spring/module/src/test/resources/testhierarchy/orphan1/test-context.xml +++ b/framework/spring/module/src/test/resources/testhierarchy/orphan1/test-context.xml @@ -26,5 +26,5 @@ - + diff --git a/plugins/acl/static-role-based/src/main/resources/META-INF/cloudstack/acl-static-role-based/spring-acl-static-role-based-context.xml b/plugins/acl/static-role-based/src/main/resources/META-INF/cloudstack/acl-static-role-based/spring-acl-static-role-based-context.xml index 633602e76c1..4c690660502 100644 --- a/plugins/acl/static-role-based/src/main/resources/META-INF/cloudstack/acl-static-role-based/spring-acl-static-role-based-context.xml +++ b/plugins/acl/static-role-based/src/main/resources/META-INF/cloudstack/acl-static-role-based/spring-acl-static-role-based-context.xml @@ -25,7 +25,7 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd" - > + > diff --git a/plugins/affinity-group-processors/explicit-dedication/src/main/resources/META-INF/cloudstack/explicit-dedication/spring-explicit-dedication-context.xml b/plugins/affinity-group-processors/explicit-dedication/src/main/resources/META-INF/cloudstack/explicit-dedication/spring-explicit-dedication-context.xml index 7e98c388026..5f049fa3d95 100644 --- a/plugins/affinity-group-processors/explicit-dedication/src/main/resources/META-INF/cloudstack/explicit-dedication/spring-explicit-dedication-context.xml +++ b/plugins/affinity-group-processors/explicit-dedication/src/main/resources/META-INF/cloudstack/explicit-dedication/spring-explicit-dedication-context.xml @@ -32,5 +32,5 @@ - + diff --git a/plugins/affinity-group-processors/host-anti-affinity/src/main/resources/META-INF/cloudstack/host-anti-affinity/spring-host-anti-affinity-context.xml b/plugins/affinity-group-processors/host-anti-affinity/src/main/resources/META-INF/cloudstack/host-anti-affinity/spring-host-anti-affinity-context.xml index 362bb470d38..0cfe6b38084 100644 --- a/plugins/affinity-group-processors/host-anti-affinity/src/main/resources/META-INF/cloudstack/host-anti-affinity/spring-host-anti-affinity-context.xml +++ b/plugins/affinity-group-processors/host-anti-affinity/src/main/resources/META-INF/cloudstack/host-anti-affinity/spring-host-anti-affinity-context.xml @@ -33,5 +33,5 @@ - + diff --git a/plugins/affinity-group-processors/non-strict-host-affinity/src/main/resources/META-INF/cloudstack/non-strict-host-affinity/spring-non-strict-host-affinity-context.xml b/plugins/affinity-group-processors/non-strict-host-affinity/src/main/resources/META-INF/cloudstack/non-strict-host-affinity/spring-non-strict-host-affinity-context.xml index a80ddb1e3bb..3d3959b7e2b 100644 --- a/plugins/affinity-group-processors/non-strict-host-affinity/src/main/resources/META-INF/cloudstack/non-strict-host-affinity/spring-non-strict-host-affinity-context.xml +++ b/plugins/affinity-group-processors/non-strict-host-affinity/src/main/resources/META-INF/cloudstack/non-strict-host-affinity/spring-non-strict-host-affinity-context.xml @@ -33,5 +33,5 @@ - + diff --git a/plugins/affinity-group-processors/non-strict-host-anti-affinity/src/main/resources/META-INF/cloudstack/non-strict-host-anti-affinity/spring-non-strict-host-anti-affinity-context.xml b/plugins/affinity-group-processors/non-strict-host-anti-affinity/src/main/resources/META-INF/cloudstack/non-strict-host-anti-affinity/spring-non-strict-host-anti-affinity-context.xml index 0f42019b269..8c8a0f4218f 100644 --- a/plugins/affinity-group-processors/non-strict-host-anti-affinity/src/main/resources/META-INF/cloudstack/non-strict-host-anti-affinity/spring-non-strict-host-anti-affinity-context.xml +++ b/plugins/affinity-group-processors/non-strict-host-anti-affinity/src/main/resources/META-INF/cloudstack/non-strict-host-anti-affinity/spring-non-strict-host-anti-affinity-context.xml @@ -33,5 +33,5 @@ - + diff --git a/plugins/api/rate-limit/src/main/resources/META-INF/cloudstack/rate-limit/spring-rate-limit-context.xml b/plugins/api/rate-limit/src/main/resources/META-INF/cloudstack/rate-limit/spring-rate-limit-context.xml index d25c57cb0c5..c8308092288 100644 --- a/plugins/api/rate-limit/src/main/resources/META-INF/cloudstack/rate-limit/spring-rate-limit-context.xml +++ b/plugins/api/rate-limit/src/main/resources/META-INF/cloudstack/rate-limit/spring-rate-limit-context.xml @@ -28,5 +28,5 @@ > - + diff --git a/plugins/dedicated-resources/src/main/resources/META-INF/cloudstack/core/spring-dedicated-resources-core-context.xml b/plugins/dedicated-resources/src/main/resources/META-INF/cloudstack/core/spring-dedicated-resources-core-context.xml index c35031d9c39..2680d8a9067 100644 --- a/plugins/dedicated-resources/src/main/resources/META-INF/cloudstack/core/spring-dedicated-resources-core-context.xml +++ b/plugins/dedicated-resources/src/main/resources/META-INF/cloudstack/core/spring-dedicated-resources-core-context.xml @@ -29,5 +29,5 @@ - + diff --git a/plugins/deployment-planners/implicit-dedication/src/main/resources/META-INF/cloudstack/implicit-dedication/spring-implicit-dedication-context.xml b/plugins/deployment-planners/implicit-dedication/src/main/resources/META-INF/cloudstack/implicit-dedication/spring-implicit-dedication-context.xml index 3f1a715bfc5..01d18a09fa4 100644 --- a/plugins/deployment-planners/implicit-dedication/src/main/resources/META-INF/cloudstack/implicit-dedication/spring-implicit-dedication-context.xml +++ b/plugins/deployment-planners/implicit-dedication/src/main/resources/META-INF/cloudstack/implicit-dedication/spring-implicit-dedication-context.xml @@ -1,12 +1,12 @@ - - + diff --git a/plugins/ha-planners/skip-heurestics/src/main/resources/META-INF/cloudstack/skip-heurestics/spring-skip-heurestics-context.xml b/plugins/ha-planners/skip-heurestics/src/main/resources/META-INF/cloudstack/skip-heurestics/spring-skip-heurestics-context.xml index 3cb5a55bb15..f28d67c5bc1 100644 --- a/plugins/ha-planners/skip-heurestics/src/main/resources/META-INF/cloudstack/skip-heurestics/spring-skip-heurestics-context.xml +++ b/plugins/ha-planners/skip-heurestics/src/main/resources/META-INF/cloudstack/skip-heurestics/spring-skip-heurestics-context.xml @@ -1,12 +1,12 @@ - - + diff --git a/plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-compute/spring-hyperv-compute-context.xml b/plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-compute/spring-hyperv-compute-context.xml index ffb6440d3cf..5549a6b13d7 100644 --- a/plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-compute/spring-hyperv-compute-context.xml +++ b/plugins/hypervisors/hyperv/src/main/resources/META-INF/cloudstack/hyperv-compute/spring-hyperv-compute-context.xml @@ -1,12 +1,12 @@ - - + diff --git a/plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-compute/spring-ovm-compute-context.xml b/plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-compute/spring-ovm-compute-context.xml index 09a5964be08..87676ef3a72 100644 --- a/plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-compute/spring-ovm-compute-context.xml +++ b/plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-compute/spring-ovm-compute-context.xml @@ -35,5 +35,5 @@ - + diff --git a/plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-discoverer/spring-ovm-discoverer-context.xml b/plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-discoverer/spring-ovm-discoverer-context.xml index 8a340472b6e..a4a03f46542 100644 --- a/plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-discoverer/spring-ovm-discoverer-context.xml +++ b/plugins/hypervisors/ovm/src/main/resources/META-INF/cloudstack/ovm-discoverer/spring-ovm-discoverer-context.xml @@ -30,5 +30,5 @@ - + diff --git a/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-discoverer/spring-simulator-discover-context.xml b/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-discoverer/spring-simulator-discover-context.xml index 20331bc69ac..84f9f20471c 100644 --- a/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-discoverer/spring-simulator-discover-context.xml +++ b/plugins/hypervisors/simulator/src/main/resources/META-INF/cloudstack/simulator-discoverer/spring-simulator-discover-context.xml @@ -32,5 +32,5 @@ - + diff --git a/plugins/hypervisors/ucs/src/main/resources/META-INF/cloudstack/core/spring-ucs-core-context.xml b/plugins/hypervisors/ucs/src/main/resources/META-INF/cloudstack/core/spring-ucs-core-context.xml index 45f32cabb0f..1d5af47e369 100644 --- a/plugins/hypervisors/ucs/src/main/resources/META-INF/cloudstack/core/spring-ucs-core-context.xml +++ b/plugins/hypervisors/ucs/src/main/resources/META-INF/cloudstack/core/spring-ucs-core-context.xml @@ -31,5 +31,5 @@ - + diff --git a/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-compute/spring-vmware-compute-context.xml b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-compute/spring-vmware-compute-context.xml index ec1031d18a0..65a7a4cde1d 100644 --- a/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-compute/spring-vmware-compute-context.xml +++ b/plugins/hypervisors/vmware/src/main/resources/META-INF/cloudstack/vmware-compute/spring-vmware-compute-context.xml @@ -41,5 +41,5 @@ - + diff --git a/plugins/network-elements/brocade-vcs/src/main/resources/META-INF/cloudstack/vcs/spring-vcs-context.xml b/plugins/network-elements/brocade-vcs/src/main/resources/META-INF/cloudstack/vcs/spring-vcs-context.xml index 1773c83d185..4ba9ecbf46a 100644 --- a/plugins/network-elements/brocade-vcs/src/main/resources/META-INF/cloudstack/vcs/spring-vcs-context.xml +++ b/plugins/network-elements/brocade-vcs/src/main/resources/META-INF/cloudstack/vcs/spring-vcs-context.xml @@ -1,12 +1,12 @@ - - diff --git a/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-dhcp-policy.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-dhcp-policy.xml index cab9f9861ec..bf3a60c67b9 100644 --- a/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-dhcp-policy.xml +++ b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-dhcp-policy.xml @@ -60,13 +60,13 @@ under the License. status="created"/> - - - + + + diff --git a/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-edge-firewall.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-edge-firewall.xml index d2ab997ce73..ba430bf6b9d 100644 --- a/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-edge-firewall.xml +++ b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-edge-firewall.xml @@ -74,7 +74,7 @@ under the License. - + - diff --git a/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-source-nat-pool.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-source-nat-pool.xml index 957bc9f6a9a..b3951fc0953 100644 --- a/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-source-nat-pool.xml +++ b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-source-nat-pool.xml @@ -22,7 +22,7 @@ under the License. diff --git a/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-source-nat-rule.xml b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-source-nat-rule.xml index 9980df1d2c7..131bcdfbf5b 100644 --- a/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-source-nat-rule.xml +++ b/plugins/network-elements/cisco-vnmc/src/main/scripts/network/cisco/create-source-nat-rule.xml @@ -16,8 +16,8 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - @@ -56,7 +56,7 @@ under the License. diff --git a/plugins/network-elements/dns-notifier/src/main/resources/components-example.xml b/plugins/network-elements/dns-notifier/src/main/resources/components-example.xml index 76a6cad9b4a..1498a2e72bf 100755 --- a/plugins/network-elements/dns-notifier/src/main/resources/components-example.xml +++ b/plugins/network-elements/dns-notifier/src/main/resources/components-example.xml @@ -170,7 +170,7 @@ under the License. true - + @@ -178,7 +178,7 @@ under the License. - + diff --git a/plugins/network-elements/internal-loadbalancer/src/main/resources/META-INF/cloudstack/core/spring-internallb-core-context.xml b/plugins/network-elements/internal-loadbalancer/src/main/resources/META-INF/cloudstack/core/spring-internallb-core-context.xml index 84b2dc3eebd..13b80f3eb90 100644 --- a/plugins/network-elements/internal-loadbalancer/src/main/resources/META-INF/cloudstack/core/spring-internallb-core-context.xml +++ b/plugins/network-elements/internal-loadbalancer/src/main/resources/META-INF/cloudstack/core/spring-internallb-core-context.xml @@ -31,7 +31,7 @@ class="org.apache.cloudstack.network.element.InternalLoadBalancerElement"> - + diff --git a/plugins/network-elements/internal-loadbalancer/src/test/resources/lb_element.xml b/plugins/network-elements/internal-loadbalancer/src/test/resources/lb_element.xml index 0529392384e..0f7cecb35c8 100644 --- a/plugins/network-elements/internal-loadbalancer/src/test/resources/lb_element.xml +++ b/plugins/network-elements/internal-loadbalancer/src/test/resources/lb_element.xml @@ -1,19 +1,19 @@ - @@ -46,5 +46,5 @@ - + diff --git a/plugins/network-elements/internal-loadbalancer/src/test/resources/lb_svc.xml b/plugins/network-elements/internal-loadbalancer/src/test/resources/lb_svc.xml index b104f0b9288..b87d26cd91a 100644 --- a/plugins/network-elements/internal-loadbalancer/src/test/resources/lb_svc.xml +++ b/plugins/network-elements/internal-loadbalancer/src/test/resources/lb_svc.xml @@ -1,19 +1,19 @@ - @@ -44,7 +44,7 @@ - + - + diff --git a/plugins/network-elements/juniper-contrail/src/test/resources/commonContext.xml b/plugins/network-elements/juniper-contrail/src/test/resources/commonContext.xml index 77c2365fba8..708b8dbb6c5 100644 --- a/plugins/network-elements/juniper-contrail/src/test/resources/commonContext.xml +++ b/plugins/network-elements/juniper-contrail/src/test/resources/commonContext.xml @@ -1,18 +1,18 @@ - - + diff --git a/plugins/network-elements/juniper-contrail/src/test/resources/providerContext.xml b/plugins/network-elements/juniper-contrail/src/test/resources/providerContext.xml index fc7e10b5d5c..adf0e199480 100644 --- a/plugins/network-elements/juniper-contrail/src/test/resources/providerContext.xml +++ b/plugins/network-elements/juniper-contrail/src/test/resources/providerContext.xml @@ -22,7 +22,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/tx + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd diff --git a/plugins/network-elements/juniper-contrail/src/test/resources/publicNetworkContext.xml b/plugins/network-elements/juniper-contrail/src/test/resources/publicNetworkContext.xml index b2c28d2b29b..a8edec62d1f 100644 --- a/plugins/network-elements/juniper-contrail/src/test/resources/publicNetworkContext.xml +++ b/plugins/network-elements/juniper-contrail/src/test/resources/publicNetworkContext.xml @@ -1,20 +1,20 @@ - - + diff --git a/plugins/storage/image/s3/src/main/resources/META-INF/cloudstack/storage-image-s3/spring-storage-image-s3-context.xml b/plugins/storage/image/s3/src/main/resources/META-INF/cloudstack/storage-image-s3/spring-storage-image-s3-context.xml index 7b2fa465a58..f99585cdaf9 100644 --- a/plugins/storage/image/s3/src/main/resources/META-INF/cloudstack/storage-image-s3/spring-storage-image-s3-context.xml +++ b/plugins/storage/image/s3/src/main/resources/META-INF/cloudstack/storage-image-s3/spring-storage-image-s3-context.xml @@ -30,5 +30,5 @@ - + diff --git a/plugins/storage/image/swift/src/main/resources/META-INF/cloudstack/storage-image-swift/spring-storage-image-swift-context.xml b/plugins/storage/image/swift/src/main/resources/META-INF/cloudstack/storage-image-swift/spring-storage-image-swift-context.xml index a84eb420375..56ed0a2f0ca 100644 --- a/plugins/storage/image/swift/src/main/resources/META-INF/cloudstack/storage-image-swift/spring-storage-image-swift-context.xml +++ b/plugins/storage/image/swift/src/main/resources/META-INF/cloudstack/storage-image-swift/spring-storage-image-swift-context.xml @@ -29,5 +29,5 @@ - + diff --git a/plugins/storage/volume/datera/pom.xml b/plugins/storage/volume/datera/pom.xml index 5c6bdcb15dd..3007095a1ad 100644 --- a/plugins/storage/volume/datera/pom.xml +++ b/plugins/storage/volume/datera/pom.xml @@ -1,12 +1,12 @@ - diff --git a/plugins/storage/volume/default/src/main/resources/META-INF/cloudstack/storage-volume-default/spring-storage-volume-default-context.xml b/plugins/storage/volume/default/src/main/resources/META-INF/cloudstack/storage-volume-default/spring-storage-volume-default-context.xml index f6370511b27..de97dd92179 100644 --- a/plugins/storage/volume/default/src/main/resources/META-INF/cloudstack/storage-volume-default/spring-storage-volume-default-context.xml +++ b/plugins/storage/volume/default/src/main/resources/META-INF/cloudstack/storage-volume-default/spring-storage-volume-default-context.xml @@ -31,5 +31,5 @@ class="org.apache.cloudstack.storage.datastore.provider.CloudStackPrimaryDataStoreProviderImpl" /> - + diff --git a/plugins/storage/volume/solidfire/src/test/resource/storageContext.xml b/plugins/storage/volume/solidfire/src/test/resource/storageContext.xml index 4090ac3ebd2..df4fb385c2f 100644 --- a/plugins/storage/volume/solidfire/src/test/resource/storageContext.xml +++ b/plugins/storage/volume/solidfire/src/test/resource/storageContext.xml @@ -22,7 +22,7 @@ xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd - http://www.springframework.org/schema/tx + http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd @@ -35,7 +35,7 @@ - + @@ -43,10 +43,10 @@ - + - + diff --git a/plugins/storage/volume/storpool/src/main/resources/META-INF/cloudstack/storage-volume-storpool/spring-storage-volume-storpool-context.xml b/plugins/storage/volume/storpool/src/main/resources/META-INF/cloudstack/storage-volume-storpool/spring-storage-volume-storpool-context.xml index 6451fc8fd39..b4e81f166f0 100644 --- a/plugins/storage/volume/storpool/src/main/resources/META-INF/cloudstack/storage-volume-storpool/spring-storage-volume-storpool-context.xml +++ b/plugins/storage/volume/storpool/src/main/resources/META-INF/cloudstack/storage-volume-storpool/spring-storage-volume-storpool-context.xml @@ -1,12 +1,12 @@ - - + diff --git a/plugins/user-authenticators/plain-text/src/main/resources/META-INF/cloudstack/plaintext/spring-plaintext-context.xml b/plugins/user-authenticators/plain-text/src/main/resources/META-INF/cloudstack/plaintext/spring-plaintext-context.xml index fccff88c4cb..0b22b010e19 100644 --- a/plugins/user-authenticators/plain-text/src/main/resources/META-INF/cloudstack/plaintext/spring-plaintext-context.xml +++ b/plugins/user-authenticators/plain-text/src/main/resources/META-INF/cloudstack/plaintext/spring-plaintext-context.xml @@ -31,5 +31,5 @@ - + diff --git a/plugins/user-authenticators/sha256salted/src/main/resources/META-INF/cloudstack/sha256salted/spring-sha256salted-context.xml b/plugins/user-authenticators/sha256salted/src/main/resources/META-INF/cloudstack/sha256salted/spring-sha256salted-context.xml index 3e29fd9ddba..593c8282cb5 100644 --- a/plugins/user-authenticators/sha256salted/src/main/resources/META-INF/cloudstack/sha256salted/spring-sha256salted-context.xml +++ b/plugins/user-authenticators/sha256salted/src/main/resources/META-INF/cloudstack/sha256salted/spring-sha256salted-context.xml @@ -30,5 +30,5 @@ - + diff --git a/plugins/user-two-factor-authenticators/static-pin/src/main/resources/META-INF/cloudstack/staticpin/spring-staticpin-context.xml b/plugins/user-two-factor-authenticators/static-pin/src/main/resources/META-INF/cloudstack/staticpin/spring-staticpin-context.xml index ac27ba527db..6b30a98ef07 100644 --- a/plugins/user-two-factor-authenticators/static-pin/src/main/resources/META-INF/cloudstack/staticpin/spring-staticpin-context.xml +++ b/plugins/user-two-factor-authenticators/static-pin/src/main/resources/META-INF/cloudstack/staticpin/spring-staticpin-context.xml @@ -31,5 +31,5 @@ - + diff --git a/plugins/user-two-factor-authenticators/totp/src/main/resources/META-INF/cloudstack/totp/spring-google-context.xml b/plugins/user-two-factor-authenticators/totp/src/main/resources/META-INF/cloudstack/totp/spring-google-context.xml index 84a0b0cfcb7..73ab7b636d4 100644 --- a/plugins/user-two-factor-authenticators/totp/src/main/resources/META-INF/cloudstack/totp/spring-google-context.xml +++ b/plugins/user-two-factor-authenticators/totp/src/main/resources/META-INF/cloudstack/totp/spring-google-context.xml @@ -31,5 +31,5 @@ - + diff --git a/quickcloud/src/main/resources/META-INF/cloudstack/core/spring-quickcloud-core-context-override.xml b/quickcloud/src/main/resources/META-INF/cloudstack/core/spring-quickcloud-core-context-override.xml index 6074ea1ceb2..a434bbe2412 100644 --- a/quickcloud/src/main/resources/META-INF/cloudstack/core/spring-quickcloud-core-context-override.xml +++ b/quickcloud/src/main/resources/META-INF/cloudstack/core/spring-quickcloud-core-context-override.xml @@ -25,7 +25,7 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd" - > + > diff --git a/scripts/network/juniper/application-add.xml b/scripts/network/juniper/application-add.xml index 177329a0359..72fca676ce2 100644 --- a/scripts/network/juniper/application-add.xml +++ b/scripts/network/juniper/application-add.xml @@ -20,11 +20,11 @@ under the License. - -%name% -%protocol% + +%name% +%protocol% %dest-port-icmp% - + diff --git a/scripts/network/juniper/application-getone.xml b/scripts/network/juniper/application-getone.xml index 4f6b5546a5c..69e5417a58b 100644 --- a/scripts/network/juniper/application-getone.xml +++ b/scripts/network/juniper/application-getone.xml @@ -20,9 +20,9 @@ under the License. - -%name% - + +%name% + diff --git a/scripts/network/juniper/dest-nat-rule-add.xml b/scripts/network/juniper/dest-nat-rule-add.xml index 2ef1df29acc..2f043d614f7 100644 --- a/scripts/network/juniper/dest-nat-rule-add.xml +++ b/scripts/network/juniper/dest-nat-rule-add.xml @@ -49,8 +49,4 @@ under the License. - - - - - + diff --git a/scripts/network/juniper/guest-vlan-filter-term-add.xml b/scripts/network/juniper/guest-vlan-filter-term-add.xml index d0f52a0be44..9d4150958cc 100644 --- a/scripts/network/juniper/guest-vlan-filter-term-add.xml +++ b/scripts/network/juniper/guest-vlan-filter-term-add.xml @@ -19,17 +19,17 @@ under the License. - - -%filter-name% - -%term-name% - -%term-name% - - - - + + +%filter-name% + +%term-name% + +%term-name% + + + + diff --git a/scripts/network/juniper/private-interface-add.xml b/scripts/network/juniper/private-interface-add.xml index f0ccb6e0e76..d291597a57a 100644 --- a/scripts/network/juniper/private-interface-add.xml +++ b/scripts/network/juniper/private-interface-add.xml @@ -20,21 +20,21 @@ under the License. - -%private-interface-name% - - -%vlan-id% -%vlan-id% - - -
-%private-interface-ip% -
- - - - + +%private-interface-name% + + +%vlan-id% +%vlan-id% + + +
+%private-interface-ip% +
+ + + + diff --git a/scripts/network/juniper/private-interface-getone.xml b/scripts/network/juniper/private-interface-getone.xml index 474e6719366..bdbb19b412c 100644 --- a/scripts/network/juniper/private-interface-getone.xml +++ b/scripts/network/juniper/private-interface-getone.xml @@ -20,13 +20,13 @@ under the License. - -%private-interface-name% - - -%vlan-id% - - + +%private-interface-name% + + +%vlan-id% + + diff --git a/scripts/network/juniper/private-interface-with-filters-add.xml b/scripts/network/juniper/private-interface-with-filters-add.xml index 3ce8c55b242..ea6e01f6fb1 100644 --- a/scripts/network/juniper/private-interface-with-filters-add.xml +++ b/scripts/network/juniper/private-interface-with-filters-add.xml @@ -20,14 +20,14 @@ under the License. - -%private-interface-name% - - -%vlan-id% -%vlan-id% - - + +%private-interface-name% + + +%vlan-id% +%vlan-id% + + %input-filter-name% @@ -35,14 +35,14 @@ under the License. %output-filter-name% - -
-%private-interface-ip% -
- - - - + +
+%private-interface-ip% +
+ + + + diff --git a/scripts/network/juniper/proxy-arp-add.xml b/scripts/network/juniper/proxy-arp-add.xml index ae6dee0f239..118311fb620 100644 --- a/scripts/network/juniper/proxy-arp-add.xml +++ b/scripts/network/juniper/proxy-arp-add.xml @@ -19,17 +19,17 @@ under the License. - - - - -%public-interface-name% -
-%public-ip-address% -
- - - + + + + +%public-interface-name% +
+%public-ip-address% +
+ + + diff --git a/scripts/network/juniper/proxy-arp-getall.xml b/scripts/network/juniper/proxy-arp-getall.xml index 3f23a22cd5a..3ec425c28fc 100644 --- a/scripts/network/juniper/proxy-arp-getall.xml +++ b/scripts/network/juniper/proxy-arp-getall.xml @@ -19,12 +19,12 @@ under the License. - - - -%interface-name% - - + + + +%interface-name% + + diff --git a/scripts/network/juniper/proxy-arp-getone.xml b/scripts/network/juniper/proxy-arp-getone.xml index e43dc0bc5ea..3299dac9d0e 100644 --- a/scripts/network/juniper/proxy-arp-getone.xml +++ b/scripts/network/juniper/proxy-arp-getone.xml @@ -19,17 +19,17 @@ under the License. - - - - -%public-interface-name% -
-%public-ip-address% -
- - - + + + + +%public-interface-name% +
+%public-ip-address% +
+ + + diff --git a/scripts/network/juniper/public-ip-filter-term-add.xml b/scripts/network/juniper/public-ip-filter-term-add.xml index 9aad4c23990..e8ffd7aad41 100644 --- a/scripts/network/juniper/public-ip-filter-term-add.xml +++ b/scripts/network/juniper/public-ip-filter-term-add.xml @@ -19,22 +19,22 @@ under the License. - - -%filter-name% - -%term-name% - -<%address-type%> -%ip-address% - - - -%term-name% - - - - + + +%filter-name% + +%term-name% + +<%address-type%> +%ip-address% + + + +%term-name% + + + + diff --git a/scripts/network/juniper/security-policy-group.xml b/scripts/network/juniper/security-policy-group.xml index 1d0dc8cba12..46b57b0bfcb 100644 --- a/scripts/network/juniper/security-policy-group.xml +++ b/scripts/network/juniper/security-policy-group.xml @@ -19,13 +19,13 @@ under the License. - - - -%from-zone% -%to-zone% - - + + + +%from-zone% +%to-zone% + + diff --git a/scripts/network/juniper/zone-interface-add.xml b/scripts/network/juniper/zone-interface-add.xml index 9b2d37278ac..5f6d4c0416a 100644 --- a/scripts/network/juniper/zone-interface-add.xml +++ b/scripts/network/juniper/zone-interface-add.xml @@ -19,15 +19,15 @@ under the License. - - - -%private-zone-name% - -%zone-interface-name% - - - + + + +%private-zone-name% + +%zone-interface-name% + + + diff --git a/scripts/network/juniper/zone-interface-getone.xml b/scripts/network/juniper/zone-interface-getone.xml index 4bc5c4bc0d2..2078c015ba4 100644 --- a/scripts/network/juniper/zone-interface-getone.xml +++ b/scripts/network/juniper/zone-interface-getone.xml @@ -19,15 +19,15 @@ under the License. - - - -%private-zone-name% - -%zone-interface-name% - - - + + + +%private-zone-name% + +%zone-interface-name% + + + diff --git a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml index 244c2d913b9..c633a3b0abd 100644 --- a/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/core/spring-server-core-misc-context.xml @@ -72,7 +72,7 @@ - + @@ -80,5 +80,5 @@ - + diff --git a/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-backend/spring-server-alert-adapter-backend-context.xml b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-backend/spring-server-alert-adapter-backend-context.xml index a8f83b012bd..e43c25ad655 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-backend/spring-server-alert-adapter-backend-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-backend/spring-server-alert-adapter-backend-context.xml @@ -28,5 +28,5 @@ > - + diff --git a/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-compute/spring-server-alert-adapter-compute-context.xml b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-compute/spring-server-alert-adapter-compute-context.xml index 71cef6c4e1b..251c931e3a7 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-compute/spring-server-alert-adapter-compute-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-compute/spring-server-alert-adapter-compute-context.xml @@ -28,5 +28,5 @@ > - + diff --git a/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-storage/spring-server-alert-adapter-storage-context.xml b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-storage/spring-server-alert-adapter-storage-context.xml index d765063f014..e19b41512ef 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-storage/spring-server-alert-adapter-storage-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/server-alert-adapter-storage/spring-server-alert-adapter-storage-context.xml @@ -28,5 +28,5 @@ > - + diff --git a/server/src/main/resources/META-INF/cloudstack/server-allocator/spring-server-allocator-context.xml b/server/src/main/resources/META-INF/cloudstack/server-allocator/spring-server-allocator-context.xml index 664e7de8c65..d3781649845 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-allocator/spring-server-allocator-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/server-allocator/spring-server-allocator-context.xml @@ -44,5 +44,5 @@ - + diff --git a/server/src/main/resources/META-INF/cloudstack/server-fencer/spring-server-fencer-context.xml b/server/src/main/resources/META-INF/cloudstack/server-fencer/spring-server-fencer-context.xml index f11fea6eb2c..085cae52df3 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-fencer/spring-server-fencer-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/server-fencer/spring-server-fencer-context.xml @@ -27,11 +27,11 @@ http://www.springframework.org/schema/context/spring-context.xsd" > - + - + diff --git a/server/src/main/resources/META-INF/cloudstack/server-investigator/spring-server-investigator-context.xml b/server/src/main/resources/META-INF/cloudstack/server-investigator/spring-server-investigator-context.xml index dd5ce62147e..112384c53e4 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-investigator/spring-server-investigator-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/server-investigator/spring-server-investigator-context.xml @@ -42,5 +42,5 @@ - + diff --git a/server/src/main/resources/META-INF/cloudstack/server-template-adapter/spring-server-template-adapter-context.xml b/server/src/main/resources/META-INF/cloudstack/server-template-adapter/spring-server-template-adapter-context.xml index 96c3aa7f12c..b3df26b62a3 100644 --- a/server/src/main/resources/META-INF/cloudstack/server-template-adapter/spring-server-template-adapter-context.xml +++ b/server/src/main/resources/META-INF/cloudstack/server-template-adapter/spring-server-template-adapter-context.xml @@ -28,5 +28,5 @@ > - + diff --git a/server/src/main/resources/com/cloud/upgrade/databaseCreatorContext.xml b/server/src/main/resources/com/cloud/upgrade/databaseCreatorContext.xml index ba00d19781c..6b0312d4498 100644 --- a/server/src/main/resources/com/cloud/upgrade/databaseCreatorContext.xml +++ b/server/src/main/resources/com/cloud/upgrade/databaseCreatorContext.xml @@ -17,13 +17,13 @@ under the License. --> diff --git a/server/src/test/resources/VpcApiUnitTestContext.xml b/server/src/test/resources/VpcApiUnitTestContext.xml index f09c16bf46c..f3f7816d4dd 100644 --- a/server/src/test/resources/VpcApiUnitTestContext.xml +++ b/server/src/test/resources/VpcApiUnitTestContext.xml @@ -1,19 +1,19 @@ - - + diff --git a/server/src/test/resources/VpcTestContext.xml b/server/src/test/resources/VpcTestContext.xml index c9575734ba4..ae60cfabd9d 100644 --- a/server/src/test/resources/VpcTestContext.xml +++ b/server/src/test/resources/VpcTestContext.xml @@ -1,12 +1,12 @@ - - + @@ -70,7 +70,7 @@ - + diff --git a/server/src/test/resources/appLoadBalancer.xml b/server/src/test/resources/appLoadBalancer.xml index 403aff65c86..6ae64d4b601 100644 --- a/server/src/test/resources/appLoadBalancer.xml +++ b/server/src/test/resources/appLoadBalancer.xml @@ -1,19 +1,19 @@ - @@ -33,11 +33,11 @@ - + - + - + diff --git a/server/src/test/resources/testContext.xml b/server/src/test/resources/testContext.xml index c267648da05..7ea4d4247b1 100644 --- a/server/src/test/resources/testContext.xml +++ b/server/src/test/resources/testContext.xml @@ -17,13 +17,13 @@ under the License. --> - + @@ -49,7 +49,7 @@ - + @@ -91,12 +91,12 @@ under the License. 1 NM - 1 + 1 10.91.28.1 10.91.28.0/24 10.91.28.160-10.91.28.179 - --> + --> - - @@ -217,12 +217,12 @@ under the License. admin@mailprovider.com - + - + + --> instance.name TEST + --> integration.api.port 8096 @@ -272,7 +272,7 @@ under the License. The memory.capacity.threshold is a percentage value (e.g. 0.85 is 85%). Whenever the Percent Used memory in a pod exceeds this threshold, our software will alert you. - --> + --> memory.capacity.threshold 0.85 @@ -349,7 +349,7 @@ under the License. either a load balancer if clustering is used, or the management server if a single server is installed. If the port to use is 80, the ":8080" portion of the value below can be removed. - + In the vast majority of cases, all you need to change is the host, from example.com to whatever IP address or host name of your management server / load balancer. --> @@ -360,11 +360,11 @@ under the License. @@ -415,7 +415,7 @@ under the License. false - - + - + 192.168.131.168 hostip @@ -53,7 +53,7 @@ under the License. 204 globalnetworkid - + 192.168.131.168 @@ -152,19 +152,19 @@ under the License. flatnetworkdiskofferingid - + ../metadata/func/sanity.xml SANITY TEST - + com.cloud.test.regression.SanityTest ../metadata/func/regression.xml REGRESSION TEST - + ../metadata/func/templatedwnldstress.xml TEMPLATE DOWNLOAD STRESS TEST @@ -173,8 +173,8 @@ under the License. - - + + @@ -272,7 +272,7 @@ under the License. - + - + diff --git a/test/metadata/delegatedAdmin/delegated_admin_cleanup.xml b/test/metadata/delegatedAdmin/delegated_admin_cleanup.xml index 734fe667b4b..ac0f390ba90 100644 --- a/test/metadata/delegatedAdmin/delegated_admin_cleanup.xml +++ b/test/metadata/delegatedAdmin/delegated_admin_cleanup.xml @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> - + registerUserKeys @@ -37,7 +37,7 @@ under the License. secretkey - + listDomains @@ -55,8 +55,8 @@ under the License. - - + + listDomains true @@ -73,7 +73,7 @@ under the License. - + deleteUser @@ -83,7 +83,7 @@ under the License. - + deleteUser @@ -93,7 +93,7 @@ under the License. - + deleteDomain @@ -123,4 +123,4 @@ under the License. - + diff --git a/test/metadata/delegatedAdmin/delegated_admin_createusers.xml b/test/metadata/delegatedAdmin/delegated_admin_createusers.xml index 8ea7dd81696..27ce77f6cf7 100644 --- a/test/metadata/delegatedAdmin/delegated_admin_createusers.xml +++ b/test/metadata/delegatedAdmin/delegated_admin_createusers.xml @@ -36,7 +36,7 @@ under the License. - + createDomain @@ -51,8 +51,8 @@ under the License. level1domain2id - - + + createDomain @@ -72,7 +72,7 @@ under the License. - + createDomain @@ -173,8 +173,8 @@ under the License. - - + + createUser @@ -218,8 +218,8 @@ under the License. - - + + createUser @@ -262,8 +262,8 @@ under the License. domain12adminaccount - - + + createUser @@ -307,6 +307,6 @@ under the License. - + diff --git a/test/metadata/delegatedAdmin/delegated_admin_verify_part1.xml b/test/metadata/delegatedAdmin/delegated_admin_verify_part1.xml index 60815928df6..1ce18187d52 100644 --- a/test/metadata/delegatedAdmin/delegated_admin_verify_part1.xml +++ b/test/metadata/delegatedAdmin/delegated_admin_verify_part1.xml @@ -36,7 +36,7 @@ under the License. secretkey - + @@ -58,7 +58,7 @@ under the License. diskofferingid globaldiskofferingid - + @@ -67,8 +67,8 @@ under the License. - - + + createVolume @@ -84,7 +84,7 @@ under the License. diskofferingid globaldiskofferingid - + @@ -92,9 +92,9 @@ under the License. volumeid - - - + + + createTemplate @@ -123,8 +123,8 @@ under the License. - - + + registerTemplate Register template @@ -159,9 +159,9 @@ under the License. registeredtemplateid - - - + + + registerIso @@ -193,8 +193,8 @@ under the License. isoid - - + + createSnapshot @@ -211,8 +211,8 @@ under the License. snapshotid - - + + createSnapshotPolicy true @@ -244,8 +244,8 @@ under the License. snapshotpolicyid - - + + @@ -258,14 +258,14 @@ under the License. globalzoneid - + ipaddress ipaddress - + @@ -287,8 +287,8 @@ under the License. pfgroupid - - + + createPortForwardingService Create port forwarding service @@ -308,8 +308,8 @@ under the License. pfgroupid1 - - + + createPortForwardingServiceRule Create port forwarding service rule @@ -334,7 +334,7 @@ under the License. pfruleid - + @@ -367,9 +367,9 @@ under the License. lbid - - - + + + createLoadBalancerRule Create load balancer rule @@ -399,10 +399,10 @@ under the License. lbid1 - - + + - assignToLoadBalancerRule + assignToLoadBalancerRule Assign to load balancer true @@ -415,6 +415,6 @@ under the License. vmid - - - + + + diff --git a/test/metadata/delegatedAdmin/delegated_admin_verify_part2.xml b/test/metadata/delegatedAdmin/delegated_admin_verify_part2.xml index e36f27887d3..9f875054439 100644 --- a/test/metadata/delegatedAdmin/delegated_admin_verify_part2.xml +++ b/test/metadata/delegatedAdmin/delegated_admin_verify_part2.xml @@ -37,9 +37,9 @@ under the License. - - - + + + rebootVirtualMachine Reboot virtual machine @@ -51,7 +51,7 @@ under the License. - + startVirtualMachine Start virtual machine @@ -63,7 +63,7 @@ under the License. - + stopVirtualMachine Stop virtual machine @@ -75,7 +75,7 @@ under the License. - + resetPasswordForVirtualMachine Reset password for virtual machine @@ -87,7 +87,7 @@ under the License. - + changeServiceForVirtualMachine Change service offering for virtual machine @@ -103,7 +103,7 @@ under the License. - + updateVirtualMachine Update virtual machine @@ -119,7 +119,7 @@ under the License. - + listVirtualMachines List virtual machines @@ -131,7 +131,7 @@ under the License. - + deployVirtualMachine true @@ -151,7 +151,7 @@ under the License. diskofferingid globaldiskofferingid - + domainid domainid1 @@ -162,8 +162,8 @@ under the License. - - + + listVolumes @@ -175,8 +175,8 @@ under the License. volumeid - - + + attachVolume Attach volume @@ -192,7 +192,7 @@ under the License. - + detachVolume Detach volume @@ -204,7 +204,7 @@ under the License. - + createVolume Creating volume @@ -220,7 +220,7 @@ under the License. diskofferingid globaldiskofferingid - + domainid domainid1 @@ -230,8 +230,8 @@ under the License. account1 - - + + @@ -245,7 +245,7 @@ under the License. - + createSnapshot Creating snapshot @@ -265,7 +265,7 @@ under the License. - + listSnapshotPolicies Listing snapshot policies @@ -277,7 +277,7 @@ under the License. - + createSnapshotPolicy true @@ -312,7 +312,7 @@ under the License. - + updateTemplate @@ -329,7 +329,7 @@ under the License. - + updateTemplatePermissions Update template permissions @@ -345,7 +345,7 @@ under the License. - + copyTemplate Copy template @@ -365,7 +365,7 @@ under the License. - + listTemplates List templates @@ -377,7 +377,7 @@ under the License. - + listTemplatePermissions List template permissions @@ -389,7 +389,7 @@ under the License. - + createTemplate Create template @@ -419,9 +419,9 @@ under the License. account1 - - - + + + updateTemplate @@ -438,7 +438,7 @@ under the License. - + updateTemplatePermissions Update template permissions @@ -454,7 +454,7 @@ under the License. - + copyTemplate Copy template @@ -474,7 +474,7 @@ under the License. - + listTemplates List templates @@ -486,7 +486,7 @@ under the License. - + listTemplatePermissions List template permissions @@ -498,7 +498,7 @@ under the License. - + @@ -517,7 +517,7 @@ under the License. - + listIsos List isos @@ -529,7 +529,7 @@ under the License. - + copyIso Copy iso @@ -548,8 +548,8 @@ under the License. globalzoneid1 - - + + attachIso true @@ -564,8 +564,8 @@ under the License. isoid - - + + detachIso true @@ -576,12 +576,12 @@ under the License. vmid - - + + listPublicIpAddresses - true + true List public ip addresses @@ -590,7 +590,7 @@ under the License. - + associateIpAddress true @@ -610,7 +610,7 @@ under the License. - + @@ -623,8 +623,8 @@ under the License. pfgroupid - - + + listPortForwardingServiceRules List port forwarding service rule @@ -635,8 +635,8 @@ under the License. pfgroupid - - + + listPortForwardingServicesByVm List port forwarding services by vm @@ -647,7 +647,7 @@ under the License. vmid - + removePortForwardingService @@ -667,8 +667,8 @@ under the License. ipaddress - - + + assignPortForwardingService true @@ -687,8 +687,8 @@ under the License. ipaddress - - + + createPortForwardingService Create port forwarding service @@ -710,8 +710,8 @@ under the License. account1 - - + + createPortForwardingServiceRule Create port forwarding service rule @@ -730,8 +730,8 @@ under the License. pfgroupid - - + + deletePortForwardingServiceRule Delete port forwarding service rule @@ -743,8 +743,8 @@ under the License. - - + + deletePortForwardingService true @@ -756,8 +756,8 @@ under the License. - - + + listLoadBalancerRules @@ -769,8 +769,8 @@ under the License. lbid - - + + listLoadBalancerRuleInstances List load balancer rule instances @@ -781,8 +781,8 @@ under the License. lbid - - + + removeFromLoadBalancerRule Remove from load balancer @@ -797,8 +797,8 @@ under the License. vmid - - + + assignToLoadBalancerRule Assign to load balancer @@ -813,8 +813,8 @@ under the License. vmid - - + + deleteLoadBalancerRule Delete load balancer rule @@ -825,8 +825,8 @@ under the License. lbid - - + + createLoadBalancerRule Create load balancer rule @@ -850,13 +850,13 @@ under the License. roundrobin - - - + + + disassociateIpAddress - true + true Disassociate ip address @@ -876,7 +876,7 @@ under the License. - + deleteSnapshotPolicies Deleting snapshot policy @@ -888,7 +888,7 @@ under the License. - + deleteTemplate Delete template @@ -900,7 +900,7 @@ under the License. - + deleteTemplate Delete template @@ -912,7 +912,7 @@ under the License. - + deleteVolume Deleting volume @@ -924,7 +924,7 @@ under the License. - + deleteIso Delete iso @@ -935,8 +935,8 @@ under the License. isoid - - + + destroyVirtualMachine Destroy virtual machine @@ -947,6 +947,6 @@ under the License. vmid - + - + diff --git a/test/metadata/delegatedAdmin/pickuser_domainlevel1_domainlevel2.xml b/test/metadata/delegatedAdmin/pickuser_domainlevel1_domainlevel2.xml index 42eb498ec35..6b66d9aad33 100644 --- a/test/metadata/delegatedAdmin/pickuser_domainlevel1_domainlevel2.xml +++ b/test/metadata/delegatedAdmin/pickuser_domainlevel1_domainlevel2.xml @@ -47,8 +47,8 @@ under the License. account1 - - + + listDomains @@ -67,10 +67,10 @@ under the License. domainlevel1 - - + - + + listUsers @@ -98,7 +98,7 @@ under the License. - + listDomains @@ -118,5 +118,5 @@ under the License. - + diff --git a/test/metadata/delegatedAdmin/pickuser_domainlevel1admin_domainlevel1admin.xml b/test/metadata/delegatedAdmin/pickuser_domainlevel1admin_domainlevel1admin.xml index b0cd1614fd0..f283affe292 100644 --- a/test/metadata/delegatedAdmin/pickuser_domainlevel1admin_domainlevel1admin.xml +++ b/test/metadata/delegatedAdmin/pickuser_domainlevel1admin_domainlevel1admin.xml @@ -47,8 +47,8 @@ under the License. account1 - - + + listDomains @@ -67,10 +67,10 @@ under the License. domainlevel1 - - + - + + listUsers @@ -98,7 +98,7 @@ under the License. - + listDomains @@ -118,5 +118,5 @@ under the License. - + diff --git a/test/metadata/delegatedAdmin/pickuser_domainlevel1admin_rootadmin.xml b/test/metadata/delegatedAdmin/pickuser_domainlevel1admin_rootadmin.xml index 87cb933bd00..29c4a5ac01e 100644 --- a/test/metadata/delegatedAdmin/pickuser_domainlevel1admin_rootadmin.xml +++ b/test/metadata/delegatedAdmin/pickuser_domainlevel1admin_rootadmin.xml @@ -47,8 +47,8 @@ under the License. account1 - - + + listDomains @@ -67,10 +67,10 @@ under the License. domainlevel1 - - + - + + listUsers @@ -98,7 +98,7 @@ under the License. - + listDomains @@ -118,5 +118,5 @@ under the License. - + diff --git a/test/metadata/delegatedAdmin/pickuser_domainlevel2_child_domainlevel1.xml b/test/metadata/delegatedAdmin/pickuser_domainlevel2_child_domainlevel1.xml index 5e77ca95932..662fe0f25c1 100644 --- a/test/metadata/delegatedAdmin/pickuser_domainlevel2_child_domainlevel1.xml +++ b/test/metadata/delegatedAdmin/pickuser_domainlevel2_child_domainlevel1.xml @@ -47,8 +47,8 @@ under the License. account1 - - + + listDomains @@ -67,10 +67,10 @@ under the License. domainlevel1 - - + - + + listUsers @@ -98,7 +98,7 @@ under the License. - + listDomains @@ -118,5 +118,5 @@ under the License. - + diff --git a/test/metadata/delegatedAdmin/pickuser_domainlevel2_nonchild_domainlevel1.xml b/test/metadata/delegatedAdmin/pickuser_domainlevel2_nonchild_domainlevel1.xml index b2192a2f03d..18a7b421343 100644 --- a/test/metadata/delegatedAdmin/pickuser_domainlevel2_nonchild_domainlevel1.xml +++ b/test/metadata/delegatedAdmin/pickuser_domainlevel2_nonchild_domainlevel1.xml @@ -47,8 +47,8 @@ under the License. account1 - - + + listDomains @@ -67,10 +67,10 @@ under the License. domainlevel1 - - + - + + listUsers @@ -98,7 +98,7 @@ under the License. - + listDomains @@ -118,5 +118,5 @@ under the License. - + diff --git a/test/metadata/delegatedAdmin/pickuser_domainlevel2_rootadmin1.xml b/test/metadata/delegatedAdmin/pickuser_domainlevel2_rootadmin1.xml index ecf06af098f..c1b91351cbb 100644 --- a/test/metadata/delegatedAdmin/pickuser_domainlevel2_rootadmin1.xml +++ b/test/metadata/delegatedAdmin/pickuser_domainlevel2_rootadmin1.xml @@ -47,8 +47,8 @@ under the License. account1 - - + + listDomains @@ -67,10 +67,10 @@ under the License. domainlevel1 - - + - + + listUsers @@ -98,7 +98,7 @@ under the License. - + listDomains @@ -118,5 +118,5 @@ under the License. - + diff --git a/test/metadata/delegatedAdmin/pickuser_rootadmin1_rootadmin2.xml b/test/metadata/delegatedAdmin/pickuser_rootadmin1_rootadmin2.xml index d7c7a03d676..aa85730890a 100644 --- a/test/metadata/delegatedAdmin/pickuser_rootadmin1_rootadmin2.xml +++ b/test/metadata/delegatedAdmin/pickuser_rootadmin1_rootadmin2.xml @@ -47,8 +47,8 @@ under the License. account1 - - + + listDomains @@ -67,10 +67,10 @@ under the License. domainlevel1 - - + - + + listUsers @@ -98,7 +98,7 @@ under the License. - + listDomains @@ -118,5 +118,5 @@ under the License. - + diff --git a/test/metadata/delegatedAdmin/pickuser_rootadmin_vs_domainlevel1admin.xml b/test/metadata/delegatedAdmin/pickuser_rootadmin_vs_domainlevel1admin.xml index 361b934eee5..79da605f363 100644 --- a/test/metadata/delegatedAdmin/pickuser_rootadmin_vs_domainlevel1admin.xml +++ b/test/metadata/delegatedAdmin/pickuser_rootadmin_vs_domainlevel1admin.xml @@ -47,8 +47,8 @@ under the License. account1 - - + + listDomains @@ -67,10 +67,10 @@ under the License. domainlevel1 - - + - + + listUsers @@ -98,7 +98,7 @@ under the License. - + listDomains @@ -118,5 +118,5 @@ under the License. - + diff --git a/test/metadata/func/directnw_regression.xml b/test/metadata/func/directnw_regression.xml index 944ee3c314f..3cce8b1f869 100644 --- a/test/metadata/func/directnw_regression.xml +++ b/test/metadata/func/directnw_regression.xml @@ -18,10 +18,10 @@ under the License. --> - - + + - + createAccount [Create the Account and a User for the account] @@ -59,7 +59,7 @@ under the License. password - + id @@ -164,11 +164,11 @@ under the License. - + - + listUsers 5 [List the Created User in (3)] @@ -177,7 +177,7 @@ under the License. accountname - + id @@ -222,14 +222,14 @@ under the License. domain ROOT - + - - - + + + - + createUser 3 [Create User Command] @@ -261,9 +261,9 @@ under the License. email nimbus-user@gmail.com - + - + id @@ -312,7 +312,7 @@ under the License. - + @@ -324,7 +324,7 @@ under the License. accountname - + id @@ -429,7 +429,7 @@ under the License. - + @@ -473,7 +473,7 @@ under the License. usersecretkey - + id @@ -534,7 +534,7 @@ under the License. - + @@ -606,11 +606,11 @@ under the License. - + - - + @@ -753,7 +753,7 @@ under the License. - + @@ -825,7 +825,7 @@ under the License. - + @@ -945,7 +945,7 @@ under the License. state locked - + @@ -963,7 +963,7 @@ under the License. domainid 1 - + @@ -1065,7 +1065,7 @@ under the License. state enabled - + @@ -1189,7 +1189,7 @@ under the License. state disabled - + @@ -1207,7 +1207,7 @@ under the License. domainid 1 - + @@ -1309,7 +1309,7 @@ under the License. state enabled - + @@ -1325,7 +1325,7 @@ under the License. domainname - + name @@ -1366,7 +1366,7 @@ under the License. domainname - + id @@ -1414,7 +1414,7 @@ under the License. newdomainname - + id @@ -1456,7 +1456,7 @@ under the License. 1 - + domain 0 @@ -1486,8 +1486,8 @@ under the License. - - + + @@ -1503,7 +1503,7 @@ under the License. true - + success @@ -1528,7 +1528,7 @@ under the License. 1 - + template 0 @@ -1586,7 +1586,7 @@ under the License. size - debian50templatesize + debian50templatesize account @@ -1619,7 +1619,7 @@ under the License. domainid 1 - + @@ -1829,7 +1829,7 @@ under the License. offerha false - + @@ -1867,7 +1867,7 @@ under the License. vlan - guestcidraddress + guestcidraddress networktype diff --git a/test/metadata/func/expunge.xml b/test/metadata/func/expunge.xml index 72ccb2afb6e..d008dc3319f 100644 --- a/test/metadata/func/expunge.xml +++ b/test/metadata/func/expunge.xml @@ -19,7 +19,7 @@ under the License. - + + --> createAccount [Create the Account and a User for the account] @@ -95,7 +95,7 @@ under the License. accountname - + id @@ -104,7 +104,7 @@ under the License. - - + registerUserKeys Registering the user @@ -205,7 +205,7 @@ under the License. - + deployVirtualMachine true @@ -222,7 +222,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -259,7 +259,7 @@ under the License. - + listVirtualMachines List virtual machines @@ -276,7 +276,7 @@ under the License. - + listHosts List host where vm is running @@ -293,7 +293,7 @@ under the License. - + listRouters List Routers @@ -326,7 +326,7 @@ under the License. - + listHosts List host where domR is running @@ -342,8 +342,8 @@ under the License. routerhost_ipaddress - - + + listVolumes List data disk vm volume @@ -368,7 +368,7 @@ under the License. - + select path from volumes true @@ -386,7 +386,7 @@ under the License. - + listVolumes List root disk vm volume @@ -411,7 +411,7 @@ under the License. - + select path from volumes true @@ -429,7 +429,7 @@ under the License. - + select path from volumes true @@ -463,7 +463,7 @@ under the License. - + listvdi.sh @@ -478,8 +478,8 @@ under the License. vm_rootvolumepath - - + + listvdi.sh @@ -494,7 +494,7 @@ under the License. router_rootvolumepath - + @@ -507,7 +507,7 @@ under the License. - + listConfigurations Getting expunge interval value @@ -524,7 +524,7 @@ under the License. - + sleep.sh @@ -535,9 +535,9 @@ under the License. expunge.interval - - - + + + sleep.sh @@ -548,9 +548,9 @@ under the License. expunge.interval - - - + + + listvdi.sh true @@ -567,7 +567,7 @@ under the License. - + listvdi.sh true @@ -584,8 +584,8 @@ under the License. - - + + createVolume @@ -602,7 +602,7 @@ under the License. diskofferingid globaldiskofferingid - + @@ -611,7 +611,7 @@ under the License. - + attachVolume true @@ -627,7 +627,7 @@ under the License. - + detachVolume true @@ -639,7 +639,7 @@ under the License. - + createSnapshot true @@ -661,7 +661,7 @@ under the License. - + select path from volumes true @@ -679,7 +679,7 @@ under the License. - + listvdi.sh @@ -694,8 +694,8 @@ under the License. detached_volumepath - - + + deleteVolume Delete detached volume @@ -707,7 +707,7 @@ under the License. - + sleep.sh @@ -718,9 +718,9 @@ under the License. expunge.interval - - - + + + sleep.sh @@ -731,8 +731,8 @@ under the License. expunge.interval - - + + listvdi.sh true @@ -749,7 +749,7 @@ under the License. - + listvdi.sh @@ -765,9 +765,9 @@ under the License. snapshotpath - - - + + + stopRouter @@ -778,8 +778,8 @@ under the License. router_id - - + + deleteUser Deleting the user @@ -789,8 +789,8 @@ under the License. userid - - + + listvdi.sh true @@ -807,7 +807,7 @@ under the License. - + listvdi.sh true @@ -823,10 +823,10 @@ under the License. snapshotpath - - - - + + + + @@ -843,7 +843,7 @@ under the License. - + ms.sh @@ -876,8 +876,8 @@ under the License. - - + + deployVirtualMachine true @@ -894,7 +894,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -927,7 +927,7 @@ under the License. - + listVolumes @@ -947,7 +947,7 @@ under the License. - + stopVirtualMachine Stop virtual machine @@ -958,7 +958,7 @@ under the License. - + createTemplate Create template from root volume @@ -986,8 +986,8 @@ under the License. - - + + deployVirtualMachine Deploying virtual machine from the private template @@ -1003,7 +1003,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid privatetemplateid @@ -1040,7 +1040,7 @@ under the License. - + listHosts List host where vm is running @@ -1057,7 +1057,7 @@ under the License. - + select install_path from template_spool_ref true @@ -1075,7 +1075,7 @@ under the License. - + listvdi.sh @@ -1091,7 +1091,7 @@ under the License. - + destroyVirtualMachine Destroy virtual machine created from the private template @@ -1102,7 +1102,7 @@ under the License. - + sleep.sh @@ -1113,8 +1113,8 @@ under the License. 240 - - + + listvdi.sh true @@ -1144,7 +1144,7 @@ under the License. - + deleteTemplate Delete private template @@ -1155,7 +1155,7 @@ under the License. - + updateConfiguration Updating storage.cleanup.interval @@ -1170,7 +1170,7 @@ under the License. - + ms.sh @@ -1202,6 +1202,6 @@ under the License. - - + + diff --git a/test/metadata/func/external_firewall.xml b/test/metadata/func/external_firewall.xml index afb92446bed..d0f7efb7062 100644 --- a/test/metadata/func/external_firewall.xml +++ b/test/metadata/func/external_firewall.xml @@ -61,7 +61,7 @@ under the License. - + createNetwork @@ -99,7 +99,7 @@ under the License. - + deployVirtualMachine deploying virtual machine @@ -144,10 +144,10 @@ under the License. - - - - + + + + associateIpAddress Associating first public ip address @@ -169,14 +169,14 @@ under the License. id nonsourcenatpublicip1id - + ipaddress nonsourcenatpublicip1 - + associateIpAddress Associating second public ip address @@ -198,15 +198,15 @@ under the License. id nonsourcenatpublicip2id - + ipaddress nonsourcenatpublicip2 - - + + enableStaticNat Enable Static NAT - 1 @@ -214,11 +214,11 @@ under the License. ipaddressid nonsourcenatpublicip1id - + virtualmachineid vmid - + @@ -250,7 +250,7 @@ under the License. - + sleep.sh @@ -261,8 +261,8 @@ under the License. 120 - - + + ssh.sh @@ -282,9 +282,9 @@ under the License. - - - + + + createLoadBalancerRule Creating load balancer rule @@ -324,8 +324,8 @@ under the License. lbid - - + + assignToLoadBalancerRule Assigning vm to the load balancer @@ -339,8 +339,8 @@ under the License. vmid - - + + deleteLoadBalancerRule Deleting the load balancer @@ -350,8 +350,8 @@ under the License. lbid - - + + disassociateIpAddress Dissociating first public ip address @@ -362,7 +362,7 @@ under the License. - + disassociateIpAddress Dissociating second public ip address @@ -373,7 +373,7 @@ under the License. - + deleteAccount Delete account @@ -383,7 +383,7 @@ under the License. accountid - - - + + + diff --git a/test/metadata/func/flatnetwork.xml b/test/metadata/func/flatnetwork.xml index 60866537b01..70648b312d3 100644 --- a/test/metadata/func/flatnetwork.xml +++ b/test/metadata/func/flatnetwork.xml @@ -56,7 +56,7 @@ under the License. - + registerUserKeys Registering the user @@ -77,7 +77,7 @@ under the License. - + createNetworkGroup true @@ -89,7 +89,7 @@ under the License. - + authorizeNetworkGroupIngress Authorizing network group ingress @@ -124,7 +124,7 @@ under the License. - + deployVirtualMachine true @@ -158,7 +158,7 @@ under the License. - + deployVirtualMachine true @@ -187,8 +187,8 @@ under the License. vmid1 - - + + createVolume true @@ -213,8 +213,8 @@ under the License. - - + + attachVolume true @@ -230,7 +230,7 @@ under the License. - + sleep.sh @@ -241,8 +241,8 @@ under the License. 120 - - + + ssh.sh @@ -258,7 +258,7 @@ under the License. - + sleep.sh @@ -269,8 +269,8 @@ under the License. 60 - - + + stopVirtualMachine true @@ -282,7 +282,7 @@ under the License. - + startVirtualMachine true @@ -294,7 +294,7 @@ under the License. - + rebootVirtualMachine true @@ -318,7 +318,7 @@ under the License. - + attachVolume true @@ -334,8 +334,8 @@ under the License. - - + + stopVirtualMachine true @@ -347,7 +347,7 @@ under the License. - + startVirtualMachine true @@ -359,7 +359,7 @@ under the License. - + rebootVirtualMachine true @@ -383,8 +383,8 @@ under the License. - - + + deleteVolume true @@ -396,7 +396,7 @@ under the License. - + createVolume true @@ -421,8 +421,8 @@ under the License. - - + + attachVolume true @@ -438,8 +438,8 @@ under the License. - - + + revokeNetworkGroupIngress Revoking network group igress @@ -474,8 +474,8 @@ under the License. - - + + ssh.sh @@ -492,7 +492,7 @@ under the License. - + destroyVirtualMachine true @@ -504,7 +504,7 @@ under the License. - + sleep.sh @@ -515,10 +515,10 @@ under the License. 120 - - - - + + + + deleteUser Deleting the user @@ -528,6 +528,6 @@ under the License. userid - + diff --git a/test/metadata/func/ha.xml b/test/metadata/func/ha.xml index fa2ccb4b631..32ad2c22a51 100644 --- a/test/metadata/func/ha.xml +++ b/test/metadata/func/ha.xml @@ -33,7 +33,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -74,7 +74,7 @@ under the License. - + deployVirtualMachine Deploy ha enabled vm @@ -90,7 +90,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -131,8 +131,8 @@ under the License. - - + + updateVirtualMachine Update virtual machine @@ -147,7 +147,7 @@ under the License. - + listHosts @@ -165,7 +165,7 @@ under the License. - + listHosts List host with ha enabled machine @@ -201,8 +201,8 @@ under the License. instance_name - - + + select instance_name from vm_instance true @@ -219,7 +219,7 @@ under the License. instance_name_ha - + @@ -236,8 +236,8 @@ under the License. instance_name - - + + killvm.sh @@ -252,7 +252,7 @@ under the License. instance_name_ha - + @@ -265,7 +265,7 @@ under the License. 300 - + @@ -283,8 +283,8 @@ under the License. Stopped - - + + listVirtualMachines List virtual machine with ha enabled @@ -305,7 +305,7 @@ under the License. - + listHosts List host with ha enabled machine @@ -322,7 +322,7 @@ under the License. - + listvm.sh @@ -337,9 +337,9 @@ under the License. instance_name_ha - - - + + + @@ -352,7 +352,7 @@ under the License. - + destroyVirtualMachine Destroy ha enabled vm as a part of cleanup @@ -363,5 +363,5 @@ under the License. - - + + diff --git a/test/metadata/func/iso.xml b/test/metadata/func/iso.xml index 8e4c1c1c904..aa6d361e96c 100644 --- a/test/metadata/func/iso.xml +++ b/test/metadata/func/iso.xml @@ -37,8 +37,8 @@ under the License. secretkey - - + + deployVirtualMachine true @@ -54,7 +54,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -87,7 +87,7 @@ under the License. - + attachIso true @@ -103,7 +103,7 @@ under the License. - + listVirtualMachines 869-2 @@ -120,10 +120,10 @@ under the License. - - + + - + createAccount [Create the Account and a User for the account] @@ -186,8 +186,8 @@ under the License. - - +--> registerUserKeys @@ -249,8 +249,8 @@ under the License. secretkey - - + + attachIso true @@ -267,8 +267,8 @@ under the License. - - + + registerUserKeys @@ -288,8 +288,8 @@ under the License. secretkey - - + + destroyVirtualMachine @@ -299,7 +299,7 @@ under the License. - + attachIso 871 @@ -315,8 +315,8 @@ under the License. - - + + attachIso @@ -333,7 +333,7 @@ under the License. - + @@ -351,7 +351,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -384,7 +384,7 @@ under the License. - + attachIso true @@ -399,7 +399,7 @@ under the License. - + rebootVirtualMachine true @@ -411,7 +411,7 @@ under the License. - + listVirtualMachines 1073-2 @@ -428,7 +428,7 @@ under the License. - + stopVirtualMachine @@ -441,7 +441,7 @@ under the License. - + listVirtualMachines 1074-2 @@ -458,7 +458,7 @@ under the License. - + startVirtualMachine true @@ -470,7 +470,7 @@ under the License. - + listVirtualMachines 1074-4 @@ -487,8 +487,8 @@ under the License. - - + + listRouters @@ -515,8 +515,8 @@ under the License. routerid - - + + attachIso 1075 @@ -532,7 +532,7 @@ under the License. - + detachIso @@ -545,8 +545,8 @@ under the License. - - + + attachIso @@ -562,7 +562,7 @@ under the License. - + stopVirtualMachine true @@ -573,7 +573,7 @@ under the License. - + detachIso true @@ -585,8 +585,8 @@ under the License. - - + + destroyVirtualMachine @@ -598,7 +598,7 @@ under the License. - + deployVirtualMachine true @@ -615,7 +615,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globalisoid @@ -652,7 +652,7 @@ under the License. - + destroyVirtualMachine @@ -664,7 +664,7 @@ under the License. - + deployVirtualMachine true @@ -681,7 +681,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globalisoid @@ -718,7 +718,7 @@ under the License. - + detachIso true @@ -730,7 +730,7 @@ under the License. - + rebootVirtualMachine true @@ -742,7 +742,7 @@ under the License. - + listVirtualMachines 1079-4 @@ -759,9 +759,9 @@ under the License. - - - + + + destroyVirtualMachine @@ -789,7 +789,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globalisoid @@ -826,7 +826,7 @@ under the License. - + detachIso true @@ -838,7 +838,7 @@ under the License. - + stopVirtualMachine true @@ -850,7 +850,7 @@ under the License. - + startVirtualMachine true @@ -862,7 +862,7 @@ under the License. - + listVirtualMachines 1080-4 @@ -879,8 +879,8 @@ under the License. - - + + deleteUser @@ -892,7 +892,7 @@ under the License. - + destroyVirtualMachine Destroying vm as a part of cleanup @@ -902,6 +902,6 @@ under the License. vmid - - + + diff --git a/test/metadata/func/loadbalancers.xml b/test/metadata/func/loadbalancers.xml index cd983148c8f..87f2a0f9899 100644 --- a/test/metadata/func/loadbalancers.xml +++ b/test/metadata/func/loadbalancers.xml @@ -34,7 +34,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -58,7 +58,7 @@ under the License. networkids globalnetworkid - + @@ -67,7 +67,7 @@ under the License. - + associateIpAddress [Acquire a non-Source NAT IP Address for the Admin Account] @@ -85,14 +85,14 @@ under the License. 1 - + ipaddress nonsourcenatpublicip - + createLoadBalancerRule [Create Load Balancing Rule -ve test (Private Port 0)] @@ -127,8 +127,8 @@ under the License. 1 - - + + createLoadBalancerRule [Create Load Balancing Rule -ve test (Private Port 65536)] @@ -163,8 +163,8 @@ under the License. 1 - - + + createLoadBalancerRule [Create Load Balancing Rule -ve test (Private Port 65536)] @@ -199,8 +199,8 @@ under the License. 1 - - + + createLoadBalancerRule [Create Load Balancing Rule -ve test (Public Port 65536)] @@ -235,8 +235,8 @@ under the License. 1 - - + + createLoadBalancerRule @@ -270,8 +270,8 @@ under the License. 1 - - + + createLoadBalancerRule 919-1 [Create Load Balancing Rule - 2] @@ -304,8 +304,8 @@ under the License. 1 - - + + createLoadBalancerRule 919-2 [Create Load Balancing Rule - 3] @@ -338,8 +338,8 @@ under the License. 1 - - + + createLoadBalancerRule true @@ -373,7 +373,7 @@ under the License. 1 - + @@ -411,8 +411,8 @@ under the License. 1 - - + + createLoadBalancerRule 920-2 [Create a Load Balancer Rule with the Same Name] @@ -446,7 +446,7 @@ under the License. 1 - + @@ -483,7 +483,7 @@ under the License. 1 - + createAccount @@ -543,16 +543,16 @@ under the License. account accountvar - + id userid - + - +--> registerUserKeys [Register User Keys] @@ -615,8 +615,8 @@ under the License. secretkey - - + + createNetwork [Creating default network] @@ -653,7 +653,7 @@ under the License. - + deployVirtualMachine [Deploy Virtual Machine in that Account] @@ -670,7 +670,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -686,7 +686,7 @@ under the License. account accountvar - + domainid 1 @@ -694,7 +694,7 @@ under the License. networkids networkid - + @@ -703,7 +703,7 @@ under the License. - + associateIpAddress [Acquire a Non-Source NAT IP Address] @@ -722,14 +722,14 @@ under the License. 1 - + ipaddress nonsourcenatpublicip1 - + createLoadBalancerRule [Creating a LB Rule with the same name of a rule in another account] @@ -765,7 +765,7 @@ under the License. 1 - + @@ -803,8 +803,8 @@ under the License. - - + + createLoadBalancerRule @@ -840,8 +840,8 @@ under the License. admin - - + + associateIpAddress @@ -860,14 +860,14 @@ under the License. 1 - + ipaddress nonsourcenatpublicip - + createLoadBalancerRule 924 [Create Load Balancer Rule from non-Source NAT IP Address] @@ -900,8 +900,8 @@ under the License. 1 - - + + deleteLoadBalancerRule @@ -914,7 +914,7 @@ under the License. 10000 - + @@ -926,7 +926,7 @@ under the License. accountid - + createAccount @@ -987,16 +987,16 @@ under the License. account accountvar - + id userid - + - +--> registerUserKeys [Register User Keys] @@ -1059,8 +1059,8 @@ under the License. secretkey - - + + createNetwork [Creating default network] @@ -1097,7 +1097,7 @@ under the License. - + deployVirtualMachine [Deploy Virtual Machine in the account created] @@ -1114,7 +1114,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -1137,7 +1137,7 @@ under the License. - + associateIpAddress [Acquire a non-Source NAT IP Address for that account] @@ -1156,14 +1156,14 @@ under the License. 1 - + ipaddress nonsourcenatpublicip1 - + createLoadBalancerRule [Create Load Balancer Rule with the acquired Ip address] @@ -1204,8 +1204,8 @@ under the License. lbid1 - - + + createLoadBalancerRule [Create a Second Load Balancer Rule with the Acquired Ip Address] @@ -1238,7 +1238,7 @@ under the License. domainid 1 - + @@ -1246,8 +1246,8 @@ under the License. lbid2 - - + + createLoadBalancerRule [Create a Third Load Balancer Rule with the Acquired Ip Address] @@ -1288,8 +1288,8 @@ under the License. lbid3 - - + + deleteLoadBalancerRule 926 [Admin allowed to Delete Load Balancer Rule of another account via 8096 port] @@ -1312,7 +1312,7 @@ under the License. accountid - + createAccount @@ -1373,16 +1373,16 @@ under the License. account accountvar - + id userid - + - +--> registerUserKeys [Register User Keys] @@ -1445,8 +1445,8 @@ under the License. secretkey - - + + deleteLoadBalancerRule [Admin allowed to Delete Load Balancer Rule of another account via 8080 port] @@ -1459,8 +1459,8 @@ under the License. - - + + deleteAccount @@ -1471,8 +1471,8 @@ under the License. accountid - - + + createAccount [Create the Account and a User for the account] @@ -1486,7 +1486,7 @@ under the License. 0 - domainid + domainid 1 @@ -1532,16 +1532,16 @@ under the License. account accountvar - + id userid - + - +--> registerUserKeys [Register User Keys] @@ -1609,7 +1609,7 @@ under the License. - + createNetwork [Creating default network] @@ -1646,7 +1646,7 @@ under the License. - + deleteLoadBalancerRule true @@ -1659,7 +1659,7 @@ under the License. - + deployVirtualMachine @@ -1676,7 +1676,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -1709,7 +1709,7 @@ under the License. - + deployVirtualMachine [Deploy a Virtual Machine-2 to check multiple VMs - LB assignment] @@ -1725,7 +1725,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -1758,7 +1758,7 @@ under the License. - + associateIpAddress [Acquire a non-Source NAT IP address] @@ -1776,14 +1776,14 @@ under the License. 1 - + ipaddress nonsourcenatpublicip - + createLoadBalancerRule [Create a Load Balancer Rule] @@ -1822,8 +1822,8 @@ under the License. lbid - - + + assignToLoadBalancerRule 939 [Assign the First VM to the Load Balancing Rule] @@ -1837,8 +1837,8 @@ under the License. vmid1 - - + + assignToLoadBalancerRule 939 [Assign the Second VM to the Load Balancing Rule] @@ -1852,8 +1852,8 @@ under the License. vmid2 - - + + createLoadBalancerRule @@ -1887,8 +1887,8 @@ under the License. 1 - - + + createLoadBalancerRule 978 [Creation of Second LoadBalancer Rule should Fail] @@ -1922,8 +1922,8 @@ under the License. 1 - - + + listRouters @@ -1950,8 +1950,8 @@ under the License. sourcenatpublicip - - + + createLoadBalancerRule 1017 [Create Load Balancer Rule with Source NAT IP Address] @@ -1984,9 +1984,9 @@ under the License. 1 - - - + + + destroyVirtualMachine @@ -1997,8 +1997,8 @@ under the License. vmid1 - - + + destroyVirtualMachine [Destroy vm as a part of cleanup] @@ -2009,7 +2009,7 @@ under the License. - + destroyVirtualMachine [Destroy vm as a part of cleanup] @@ -2020,7 +2020,7 @@ under the License. - + deleteAccount [Deleting Account as a part of cleanup] @@ -2030,7 +2030,7 @@ under the License. accountid - - - + + + diff --git a/test/metadata/func/localstorage_volume_test.xml b/test/metadata/func/localstorage_volume_test.xml index f268495b171..aa1bbcb4292 100644 --- a/test/metadata/func/localstorage_volume_test.xml +++ b/test/metadata/func/localstorage_volume_test.xml @@ -48,7 +48,7 @@ under the License. - + createVolume @@ -73,11 +73,11 @@ under the License. diskofferingid globaldiskofferingid - + - - + + listVolumes @@ -98,7 +98,7 @@ under the License. - + detachVolume 1032 @@ -110,9 +110,9 @@ under the License. - - - + + + listVolumes @@ -133,7 +133,7 @@ under the License. - + detachVolume 1034 @@ -145,9 +145,9 @@ under the License. - - - - - + + + + + diff --git a/test/metadata/func/mgmtvmsync.xml b/test/metadata/func/mgmtvmsync.xml index 9972b5555dd..f2b884e8a21 100644 --- a/test/metadata/func/mgmtvmsync.xml +++ b/test/metadata/func/mgmtvmsync.xml @@ -22,12 +22,12 @@ under the License. deployVirtualMachine deploy First VM test case - + diskofferingid globaldiskofferingid - + serviceofferingid globalserviceofferingid @@ -39,7 +39,7 @@ under the License. zoneid globalzoneid - + displayname FirstVM @@ -80,12 +80,12 @@ under the License. deployVirtualMachine deploy Second VM test case - + diskofferingid globaldiskofferingid - + serviceofferingid globalserviceofferingid @@ -97,7 +97,7 @@ under the License. zoneid globalzoneid - + displayname SecondVM @@ -172,7 +172,7 @@ under the License. haenable false - + @@ -194,7 +194,7 @@ under the License. - + @@ -231,8 +231,8 @@ under the License. instance_name_1st - - + + select instance_name from vm_instance true @@ -269,7 +269,7 @@ under the License. - + @@ -277,13 +277,13 @@ under the License. killvm.sh Kill the First HA disabled VM - + n instance_name_1st - + h ipaddress_1st @@ -295,13 +295,13 @@ under the License. killvm.sh Kill the Second HA disabled VM - + n instance_name_2nd - + h ipaddress_2nd @@ -320,7 +320,7 @@ under the License. 100 - + @@ -352,7 +352,7 @@ under the License. 100 - + @@ -369,10 +369,10 @@ under the License. state Stopped - + - - + + listVirtualMachines Check the stopped status of Second virtual machine with ha disabled @@ -387,7 +387,7 @@ under the License. state Stopped - + @@ -403,7 +403,7 @@ under the License. - + destroyVirtualMachine Destroy the Second vm as a part of cleanup @@ -421,12 +421,12 @@ under the License. deployVirtualMachine deploy VM test case - + diskofferingid globaldiskofferingid - + serviceofferingid globalserviceofferingid @@ -438,7 +438,7 @@ under the License. zoneid globalzoneid - + displayname FirstVM @@ -493,7 +493,7 @@ under the License. - + @@ -513,7 +513,7 @@ under the License. - + ms.sh @@ -537,13 +537,13 @@ under the License. shutdown.sh Shut down the VM Test Case - + n instance_name_1st - + h ipaddress_1st @@ -562,7 +562,7 @@ under the License. 60 - + @@ -593,7 +593,7 @@ under the License. 60 - + @@ -613,7 +613,7 @@ under the License. - + listHosts List host that is presumed to have the VM Test Case @@ -630,7 +630,7 @@ under the License. - + listvm.sh @@ -646,6 +646,6 @@ under the License. instance_name_1st - + diff --git a/test/metadata/func/portforwarding.xml b/test/metadata/func/portforwarding.xml index e591c0fdeeb..2c077a60cb5 100644 --- a/test/metadata/func/portforwarding.xml +++ b/test/metadata/func/portforwarding.xml @@ -78,12 +78,12 @@ under the License. account accountname - + id userid - + @@ -166,7 +166,7 @@ under the License. ---> +--> deployVirtualMachine [Deploy Virtual Machine in the created Account] @@ -202,7 +202,7 @@ under the License. networkids networkid - + @@ -237,7 +237,7 @@ under the License. 1 - + id routerid @@ -247,8 +247,8 @@ under the License. sourcenatpublicip - - + + associateIpAddress [Acquire a new IP Address for the Account] @@ -266,14 +266,14 @@ under the License. 1 - + ipaddress nonsourcenatpublicip - + createPortForwardingRule @@ -313,7 +313,7 @@ under the License. - + createPortForwardingRule @@ -353,7 +353,7 @@ under the License. - + createPortForwardingRule @@ -393,7 +393,7 @@ under the License. - + createPortForwardingRule @@ -433,9 +433,9 @@ under the License. - + - +--> createPortForwardingRule @@ -514,7 +514,7 @@ under the License. - + createPortForwardingRule 328 [Create Port Forwarding Rule with same parameters with UDP protocol] @@ -553,7 +553,7 @@ under the License. - + associateIpAddress @@ -572,14 +572,14 @@ under the License. 1 - + ipaddress nonsourcenatpublicip1 - + createPortForwardingRule [Create Port Forwarding Rule with the acquired IP Address] @@ -617,14 +617,14 @@ under the License. 1 - + id portforwardingruleid1 - + deletePortForwardingRule 329 [Delete Port Forwarding Rule] @@ -643,7 +643,7 @@ under the License. - + listPortForwardingRules 329 [Try to list the Deleted Port Forwarding Rules (del pf rule exercise end)] @@ -696,14 +696,14 @@ under the License. 1 - + id portforwardingruleid1 - + disassociateIpAddress [Release the Non-Source NAT IP Address] @@ -722,7 +722,7 @@ under the License. - + listPortForwardingRules 331 [Try to List the Port Forwarding Rules created from Released IP Address(del ip exercise end)] @@ -736,13 +736,13 @@ under the License. - + createLoadBalancerRule [Create Load Balancing Rule Inorder to test PF-LBrule collision (pf-lb collision exercise begin)] - + privateip vmipaddress @@ -781,13 +781,13 @@ under the License. - - + + assignToLoadBalancerRule [Assign the Created LB Rule to the VM created in the Test] - + virtualmachineids vmid @@ -797,14 +797,14 @@ under the License. - + createPortForwardingRule [Create Port Forwarding Rule to test PF-LBrule collision (pf-lb rule collison exercise end)] 332 true - + privateip vmipaddress @@ -838,7 +838,7 @@ under the License. - + stopRouter @@ -850,12 +850,12 @@ under the License. - + createPortForwardingRule 336 [Create Port Forwarding Rule with the Source NAT IP Address] - + privateip vmipaddress @@ -889,7 +889,7 @@ under the License. - + startRouter [Start the DomR (add new pfrule when domR is stopped exercise end)] @@ -900,14 +900,14 @@ under the License. - + createPortForwardingRule 337 [Create Port Forwarding Rule with the Source NAT IP Address] - + privateip vmipaddress @@ -940,16 +940,16 @@ under the License. 1 - + id portforwardingruleid_forremove - - + stopRouter @@ -1041,7 +1041,7 @@ under the License. - + startRouter [Start the DomR (del pf rule exercise end)] @@ -1063,6 +1063,6 @@ under the License. accountid - + diff --git a/test/metadata/func/private_templates.xml b/test/metadata/func/private_templates.xml index d733c7e7f50..c56eec4a5dc 100644 --- a/test/metadata/func/private_templates.xml +++ b/test/metadata/func/private_templates.xml @@ -77,12 +77,12 @@ under the License. account accountvar - + id userid - + @@ -124,7 +124,7 @@ under the License. ---> +--> registerUserKeys @@ -143,8 +143,8 @@ under the License. secretkey - - + + createNetwork [Creating default network] @@ -181,7 +181,7 @@ under the License. - + deployVirtualMachine true @@ -197,7 +197,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -230,8 +230,8 @@ under the License. - - + + listVolumes @@ -251,8 +251,8 @@ under the License. - - + + stopVirtualMachine @@ -264,7 +264,7 @@ under the License. - + createTemplate true @@ -294,8 +294,8 @@ under the License. - - + + startVirtualMachine @@ -307,7 +307,7 @@ under the License. - + createTemplate true @@ -331,7 +331,7 @@ under the License. - + destroyVirtualMachine @@ -343,7 +343,7 @@ under the License. - + createTemplate true @@ -367,7 +367,7 @@ under the License. - + deployVirtualMachine @@ -385,7 +385,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid privatetemplateid @@ -422,7 +422,7 @@ under the License. - + listVolumes @@ -443,7 +443,7 @@ under the License. - + stopVirtualMachine true @@ -454,7 +454,7 @@ under the License. - + createTemplate true @@ -483,7 +483,7 @@ under the License. - + deployVirtualMachine true @@ -500,7 +500,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid privatetemplateid @@ -537,7 +537,7 @@ under the License. - + createTemplate @@ -567,7 +567,7 @@ under the License. - + createTemplate true @@ -591,8 +591,8 @@ under the License. - - + + @@ -654,12 +654,12 @@ under the License. account accountvar1 - + id userid1 - + @@ -697,7 +697,7 @@ under the License. ---> +--> registerUserKeys @@ -716,8 +716,8 @@ under the License. secretkey - - + + createNetwork [Creating default network] @@ -754,7 +754,7 @@ under the License. - + deployVirtualMachine true @@ -770,7 +770,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -803,7 +803,7 @@ under the License. - + stopVirtualMachine true @@ -814,7 +814,7 @@ under the License. - + listVolumes @@ -834,7 +834,7 @@ under the License. - + createTemplate true @@ -858,9 +858,9 @@ under the License. - - - + + + deleteAccount Deleting First Account as a part of cleanup @@ -871,7 +871,7 @@ under the License. - + deleteAccount Deleting Second Account as a part of cleanup @@ -882,8 +882,8 @@ under the License. - - - + diff --git a/test/metadata/func/regression.xml b/test/metadata/func/regression.xml index 2b47dadcfcf..eebf13ff74c 100644 --- a/test/metadata/func/regression.xml +++ b/test/metadata/func/regression.xml @@ -170,7 +170,7 @@ under the License. accountname - + id @@ -215,12 +215,12 @@ under the License. domain ROOT - + - - - + + + createUser @@ -257,9 +257,9 @@ under the License. domainid 1 - + - + id @@ -318,7 +318,7 @@ under the License. accountname - + id @@ -465,7 +465,7 @@ under the License. usersecretkey - + id @@ -596,11 +596,11 @@ under the License. - + - @@ -1480,7 +1480,7 @@ under the License. true - + success @@ -1505,7 +1505,7 @@ under the License. 1 - + template 0 @@ -1563,7 +1563,7 @@ under the License. size - debian50templatesize + debian50templatesize account @@ -1596,7 +1596,7 @@ under the License. domainid 1 - + @@ -1804,7 +1804,7 @@ under the License. offerha false - + @@ -1840,7 +1840,7 @@ under the License. vlan - guestcidraddress + guestcidraddress networktype @@ -1886,7 +1886,7 @@ under the License. - + deployVirtualMachine @@ -1903,7 +1903,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -1995,8 +1995,8 @@ under the License. - - + + listVirtualMachines @@ -2077,8 +2077,8 @@ under the License. group1 - - + + listRouters @@ -2169,9 +2169,9 @@ under the License. Running - - - + + + associateIpAddress 546 @@ -2189,7 +2189,7 @@ under the License. 1 - + id nonsourcenatpublicipid @@ -2215,9 +2215,9 @@ under the License. - + - + createLoadBalancerRule @@ -2286,9 +2286,9 @@ under the License. accountname - - - + + + listLoadBalancerRules @@ -2305,8 +2305,8 @@ under the License. - - + + assignToLoadBalancerRule @@ -2321,8 +2321,8 @@ under the License. vmid - - + + deleteLoadBalancerRule @@ -2333,17 +2333,17 @@ under the License. lbid - - + + listLoadBalancerRules true - + createLoadBalancerRule - + name lbname @@ -2406,8 +2406,8 @@ under the License. accountname - - + + assignToLoadBalancerRule @@ -2420,9 +2420,9 @@ under the License. vmid - - - + + + listLoadBalancerRuleInstances @@ -2434,8 +2434,8 @@ under the License. lbid - - + + removeFromLoadBalancerRule @@ -2454,8 +2454,8 @@ under the License. accountname - - + + listLoadBalancerRuleInstances true @@ -2465,13 +2465,13 @@ under the License. lbid - - + + - + - - + + rebootVirtualMachine @@ -2483,7 +2483,7 @@ under the License. - + listVirtualMachines @@ -2503,8 +2503,8 @@ under the License. - - + + stopVirtualMachine @@ -2516,7 +2516,7 @@ under the License. - + listVirtualMachines @@ -2536,9 +2536,9 @@ under the License. - - - + + + @@ -2560,7 +2560,7 @@ under the License. - + listVolumes @@ -2580,7 +2580,7 @@ under the License. - + detachVolume @@ -2591,7 +2591,7 @@ under the License. - + listVolumes true @@ -2606,8 +2606,8 @@ under the License. - - + + createVolume @@ -2631,7 +2631,7 @@ under the License. diskofferingid globaldiskofferingid - + @@ -2639,9 +2639,9 @@ under the License. datavolumeid - - - + + + attachVolume @@ -2656,7 +2656,7 @@ under the License. - + listVolumes false @@ -2671,8 +2671,8 @@ under the License. - - + + createVolume @@ -2695,7 +2695,7 @@ under the License. diskofferingid globaldiskofferingid - + @@ -2703,8 +2703,8 @@ under the License. datavolumeid1 - - + + deleteVolume @@ -2713,8 +2713,8 @@ under the License. datavolumeid1 - - + + listVolumes true @@ -2724,10 +2724,10 @@ under the License. datavolumeid1 - - + - + + createSnapshot @@ -2758,7 +2758,7 @@ under the License. - + listSnapshots false @@ -2769,7 +2769,7 @@ under the License. - + deleteSnapshot @@ -2781,7 +2781,7 @@ under the License. - + listSnapshots @@ -2794,7 +2794,7 @@ under the License. - + createSnapshot @@ -2811,7 +2811,7 @@ under the License. - + createTemplate 958 @@ -2859,7 +2859,7 @@ under the License. - + listTemplates @@ -2900,7 +2900,7 @@ under the License. - + updateTemplate @@ -2920,7 +2920,7 @@ under the License. - + listTemplates List updated template @@ -2941,8 +2941,8 @@ under the License. - - + + listTemplatePermissions @@ -2964,8 +2964,8 @@ under the License. - - + + updateTemplatePermissions @@ -2981,7 +2981,7 @@ under the License. - + listTemplates List template with updated permission @@ -3002,8 +3002,8 @@ under the License. - - + + deleteTemplate @@ -3015,7 +3015,7 @@ under the License. - + listTemplates true @@ -3030,9 +3030,9 @@ under the License. - - + + changeServiceForVirtualMachine @@ -3048,7 +3048,7 @@ under the License. - + listVirtualMachines @@ -3072,8 +3072,8 @@ under the License. - - + + resetPasswordForVirtualMachine @@ -3094,7 +3094,7 @@ under the License. - + listVirtualMachines @@ -3114,7 +3114,7 @@ under the License. - + listVirtualMachines @@ -3135,7 +3135,7 @@ under the License. - + startVirtualMachine 18 @@ -3191,7 +3191,7 @@ under the License. - + listVirtualMachines @@ -3211,7 +3211,7 @@ under the License. - + updateVirtualMachine @@ -3226,7 +3226,7 @@ under the License. - + listVirtualMachines 21 @@ -3247,7 +3247,7 @@ under the License. - + updateVirtualMachine @@ -3261,7 +3261,7 @@ under the License. - + listVirtualMachines 21 @@ -3282,9 +3282,9 @@ under the License. - - - + + + listPublicIpAddresses @@ -3298,8 +3298,8 @@ under the License. - - + + disassociateIpAddress @@ -3315,7 +3315,7 @@ under the License. - + rebootRouter @@ -3327,7 +3327,7 @@ under the License. - + stopRouter @@ -3339,7 +3339,7 @@ under the License. - + startRouter @@ -3414,7 +3414,7 @@ under the License. - + listEvents @@ -3426,7 +3426,7 @@ under the License. - + destroyVirtualMachine @@ -3438,7 +3438,7 @@ under the License. - + listVirtualMachines @@ -3454,7 +3454,7 @@ under the License. - + recoverVirtualMachine @@ -3466,7 +3466,7 @@ under the License. - + listVirtualMachines @@ -3486,14 +3486,14 @@ under the License. - + listConfigurations 549 false - - + + listConfigurations @@ -3506,8 +3506,8 @@ under the License. - - + + updateConfiguration @@ -3523,7 +3523,7 @@ under the License. - + listConfigurations @@ -3538,9 +3538,9 @@ under the License. 35 - - - + + + listPods @@ -3549,9 +3549,9 @@ under the License. - - - + + + createAccount @@ -3591,7 +3591,7 @@ under the License. - + listAccounts @@ -3606,8 +3606,8 @@ under the License. accountid1 - - + + updateAccount 951 @@ -3626,7 +3626,7 @@ under the License. - + listAccounts @@ -3645,8 +3645,8 @@ under the License. updatedname - - + + disableAccount @@ -3664,10 +3664,10 @@ under the License. lock true - + - - + + @@ -3683,10 +3683,10 @@ under the License. 1 - - - - + + + + updateResourceLimit 953 @@ -3722,9 +3722,9 @@ under the License. 300 - - - + + + listResourceLimits true @@ -3745,9 +3745,9 @@ under the License. 300 - - - + + + updateResourceLimit 954 @@ -3765,8 +3765,8 @@ under the License. 65 - - + + listResourceLimits @@ -3785,9 +3785,9 @@ under the License. 65 - - - + + + createDiskOffering @@ -3833,9 +3833,9 @@ under the License. - - - + + + listDiskOfferings @@ -3851,9 +3851,9 @@ under the License. newdisk - - - + + + updateDiskOffering @@ -3867,8 +3867,8 @@ under the License. newdiskname - - + + listDiskOfferings @@ -3887,9 +3887,9 @@ under the License. newdiskname - + + - deleteDiskOffering @@ -3900,8 +3900,8 @@ under the License. diskid - - + + listDiskOfferings true @@ -3915,7 +3915,7 @@ under the License. diskid - + @@ -3923,29 +3923,29 @@ under the License. 750 false - + listCapacity 974 false - + listHosts false 975 - - + + listIsos 960 true - + createServiceOffering @@ -3978,7 +3978,7 @@ under the License. - + listServiceOfferings @@ -4013,8 +4013,8 @@ under the License. - - + + updateServiceOffering @@ -4033,8 +4033,8 @@ under the License. - - + + listServiceOfferings @@ -4069,8 +4069,8 @@ under the License. - - + + deleteServiceOffering @@ -4082,7 +4082,7 @@ under the License. - + listServiceOfferings 963-2 @@ -4094,9 +4094,9 @@ under the License. - - - + + + registerIso Register iso @@ -4164,8 +4164,8 @@ under the License. - - + + listIsos List isos @@ -4177,7 +4177,7 @@ under the License. - + registerTemplate @@ -4258,8 +4258,8 @@ under the License. - - + + listSystemVms @@ -4337,7 +4337,7 @@ under the License. - + rebootSystemVm @@ -4349,7 +4349,7 @@ under the License. - + stopSystemVm @@ -4360,8 +4360,8 @@ under the License. consoleid - - + + startSystemVm @@ -4372,9 +4372,9 @@ under the License. consoleid - - - + + + deleteIso @@ -4398,7 +4398,7 @@ under the License. - + deleteTemplate @@ -4437,7 +4437,7 @@ under the License. accountid - - - + + + diff --git a/test/metadata/func/regression_new.xml b/test/metadata/func/regression_new.xml index 8db3593c0cd..3554e6e45a3 100644 --- a/test/metadata/func/regression_new.xml +++ b/test/metadata/func/regression_new.xml @@ -836,7 +836,7 @@ under the License. size - debian50templatesize + debian50templatesize account @@ -869,7 +869,7 @@ under the License. domainid 1 - + @@ -1269,7 +1269,7 @@ under the License. - + sleep.sh @@ -1280,7 +1280,7 @@ under the License. 60 - + @@ -2686,7 +2686,7 @@ under the License. serviceofferingid - globalserviceofferingid + globalserviceofferingid serviceofferingname @@ -2694,7 +2694,7 @@ under the License. serviceofferingdisplaytext - + @@ -2807,7 +2807,7 @@ under the License. destroyed false - + @@ -2902,7 +2902,7 @@ under the License. state Created - + account accountname @@ -3018,7 +3018,7 @@ under the License. state Created - + account accountname @@ -3066,7 +3066,7 @@ under the License. destroyed false - + @@ -3210,7 +3210,7 @@ under the License. intervaltype MANUAL - + @@ -3320,7 +3320,7 @@ under the License. - + createTemplate 958 [Create Template from Snapshot] @@ -3373,7 +3373,7 @@ under the License. isready true - + passwordenabled false @@ -3411,7 +3411,7 @@ under the License. domainid 1 - + @@ -3458,7 +3458,7 @@ under the License. hypervisor XenServer - + @@ -3539,11 +3539,11 @@ under the License. isextractable true - + - - + + sleep.sh @@ -3554,8 +3554,8 @@ under the License. 300 - - + + listTemplates @@ -3601,7 +3601,7 @@ under the License. format VHD - + isfeatured false @@ -3648,7 +3648,7 @@ under the License. domain ROOT - + @@ -3762,7 +3762,7 @@ under the License. 240 - + listTemplates @@ -3965,7 +3965,7 @@ under the License. - + - @@ -7355,7 +7355,7 @@ under the License. state Running - + @@ -7444,7 +7444,7 @@ under the License. state Running - + @@ -7466,7 +7466,7 @@ under the License. systemvmtype consoleproxy - + zoneid globalzoneid @@ -7524,7 +7524,7 @@ under the License. state Stopped - + @@ -7612,7 +7612,7 @@ under the License. state Running - + @@ -7638,7 +7638,7 @@ under the License. privateisoid - + diff --git a/test/metadata/func/regression_test.xml b/test/metadata/func/regression_test.xml index 18dc7856d9c..53baea191b2 100644 --- a/test/metadata/func/regression_test.xml +++ b/test/metadata/func/regression_test.xml @@ -93,7 +93,7 @@ under the License. - + listAccounts @@ -200,8 +200,8 @@ under the License. false - - + + updateUser @@ -216,8 +216,8 @@ under the License. newuser - - + + listUsers @@ -271,10 +271,10 @@ under the License. created - + - - + + lockUser @@ -285,8 +285,8 @@ under the License. userid - - + + disableUser @@ -298,9 +298,9 @@ under the License. - - + + enableUser @@ -311,8 +311,8 @@ under the License. userid - - + + createDomain @@ -333,9 +333,9 @@ under the License. newdomainid - + + - listDomains @@ -356,8 +356,8 @@ under the License. domainname - - + + updateDomain @@ -372,8 +372,8 @@ under the License. newdomainname - - + + listDomains false @@ -383,8 +383,8 @@ under the License. newdomainname - - + + deleteDomain @@ -395,8 +395,8 @@ under the License. newdomainid - - + + listTemplates @@ -440,7 +440,7 @@ under the License. - + listTemplates @@ -484,7 +484,7 @@ under the License. - + listServiceOfferings @@ -508,7 +508,7 @@ under the License. - + listServiceOfferings 876 @@ -552,13 +552,13 @@ under the License. - - + + listZones 39 - + 0 zone @@ -571,7 +571,7 @@ under the License. - + deployVirtualMachine @@ -588,7 +588,7 @@ under the License. diskofferingid 5 - + templateid globaltemplateid @@ -676,8 +676,8 @@ under the License. - - + + listVirtualMachines @@ -758,8 +758,8 @@ under the License. group1 - - + + listRouters @@ -851,9 +851,9 @@ under the License. Running - - - + + + +--> - + + + +--> + + --> + + --> - + + --> + + + --> + + --> - + + + --> + + + --> + + --> - + + --> + + + --> - + + --> + + + --> + + --> + + --> - + + --> + listVirtualMachines @@ -1516,8 +1516,8 @@ under the License. - - + + rebootVirtualMachine @@ -1529,7 +1529,7 @@ under the License. - + listVirtualMachines @@ -1549,8 +1549,8 @@ under the License. - - + + stopVirtualMachine @@ -1562,7 +1562,7 @@ under the License. - + listVirtualMachines @@ -1582,9 +1582,9 @@ under the License. - - - + + + @@ -1606,7 +1606,7 @@ under the License. - + listVolumes @@ -1626,7 +1626,7 @@ under the License. - + detachVolume @@ -1637,7 +1637,7 @@ under the License. - + listVolumes true @@ -1652,8 +1652,8 @@ under the License. - - + + createVolume @@ -1685,9 +1685,9 @@ under the License. datavolumeid - - - + + + attachVolume @@ -1702,7 +1702,7 @@ under the License. - + listVolumes false @@ -1717,8 +1717,8 @@ under the License. - - + + createVolume @@ -1749,8 +1749,8 @@ under the License. datavolumeid1 - - + + deleteVolume @@ -1759,8 +1759,8 @@ under the License. datavolumeid1 - - + + listVolumes true @@ -1770,10 +1770,10 @@ under the License. datavolumeid1 - - + - + + createSnapshot @@ -1804,7 +1804,7 @@ under the License. - + listSnapshots false @@ -1815,7 +1815,7 @@ under the License. - + deleteSnapshot @@ -1827,7 +1827,7 @@ under the License. - + listSnapshots @@ -1840,7 +1840,7 @@ under the License. - + createTemplate @@ -1889,7 +1889,7 @@ under the License. - + listTemplates @@ -1930,7 +1930,7 @@ under the License. - + updateTemplate @@ -1950,7 +1950,7 @@ under the License. - + listTemplates List updated template @@ -1971,8 +1971,8 @@ under the License. - - + + listTemplatePermissions @@ -1994,8 +1994,8 @@ under the License. - - + + updateTemplatePermissions @@ -2011,7 +2011,7 @@ under the License. - + listTemplates List template with updated permission @@ -2032,8 +2032,8 @@ under the License. - - + + deleteTemplate @@ -2045,7 +2045,7 @@ under the License. - + listTemplates true @@ -2060,9 +2060,9 @@ under the License. - - + + changeServiceForVirtualMachine @@ -2078,7 +2078,7 @@ under the License. - + listVirtualMachines @@ -2102,8 +2102,8 @@ under the License. - - + + +--> listVirtualMachines @@ -2165,7 +2165,7 @@ under the License. - + startVirtualMachine 18 @@ -2221,7 +2221,7 @@ under the License. - + listVirtualMachines @@ -2241,7 +2241,7 @@ under the License. - + updateVirtualMachine @@ -2256,7 +2256,7 @@ under the License. - + listVirtualMachines 21 @@ -2277,7 +2277,7 @@ under the License. - + updateVirtualMachine @@ -2291,7 +2291,7 @@ under the License. - + listVirtualMachines 21 @@ -2312,9 +2312,9 @@ under the License. - - - + + + - + --> + + --> rebootRouter @@ -2357,7 +2357,7 @@ under the License. - + stopRouter @@ -2369,7 +2369,7 @@ under the License. - + startRouter @@ -2445,7 +2445,7 @@ under the License. - + listEvents @@ -2457,7 +2457,7 @@ under the License. - + destroyVirtualMachine @@ -2469,7 +2469,7 @@ under the License. - + listVirtualMachines @@ -2485,7 +2485,7 @@ under the License. - + recoverVirtualMachine @@ -2497,7 +2497,7 @@ under the License. - + listVirtualMachines @@ -2517,14 +2517,14 @@ under the License. - + listConfigurations 549 false - - + + listConfigurations @@ -2537,8 +2537,8 @@ under the License. - - + + updateConfiguration @@ -2554,7 +2554,7 @@ under the License. - + listConfigurations @@ -2569,9 +2569,9 @@ under the License. 35 - - - + + + listPods @@ -2580,9 +2580,9 @@ under the License. - - - + + + createUser @@ -2619,7 +2619,7 @@ under the License. - + listAccounts @@ -2634,8 +2634,8 @@ under the License. accountid1 - - + + updateAccount 951 @@ -2654,7 +2654,7 @@ under the License. - + listAccounts @@ -2673,8 +2673,8 @@ under the License. updatedname - - + + lockAccount @@ -2689,8 +2689,8 @@ under the License. 1 - - + + disableAccount @@ -2705,8 +2705,8 @@ under the License. 1 - - + + @@ -2722,10 +2722,10 @@ under the License. 1 - - - - + + + + updateResourceLimit 953 @@ -2761,9 +2761,9 @@ under the License. 300 - - - + + + listResourceLimits true @@ -2784,9 +2784,9 @@ under the License. 300 - - - + + + updateResourceLimit 954 @@ -2804,8 +2804,8 @@ under the License. 65 - - + + listResourceLimits @@ -2824,9 +2824,9 @@ under the License. 65 - - - + + + createDiskOffering @@ -2876,9 +2876,9 @@ under the License. - - - + + + listDiskOfferings @@ -2894,9 +2894,9 @@ under the License. newdisk - - - + + + updateDiskOffering @@ -2910,8 +2910,8 @@ under the License. newdiskname - - + + listDiskOfferings @@ -2930,9 +2930,9 @@ under the License. newdiskname - + + - deleteDiskOffering @@ -2943,8 +2943,8 @@ under the License. diskid - - + + listDiskOfferings true @@ -2958,9 +2958,9 @@ under the License. diskid - + + - deleteUser @@ -2971,37 +2971,37 @@ under the License. userid - - + + listAlerts 750 false - + listCapacity 974 false - + listHosts false 975 - - + + listIsos 960 true - + createServiceOffering @@ -3034,7 +3034,7 @@ under the License. - + listServiceOfferings @@ -3069,8 +3069,8 @@ under the License. - - + + updateServiceOffering @@ -3089,8 +3089,8 @@ under the License. - - + + listServiceOfferings @@ -3125,8 +3125,8 @@ under the License. - - + + deleteServiceOffering @@ -3138,7 +3138,7 @@ under the License. - + listServiceOfferings 963-2 @@ -3150,9 +3150,9 @@ under the License. - - - + + + registerIso Register iso @@ -3220,8 +3220,8 @@ under the License. - - + + listIsos List isos @@ -3233,7 +3233,7 @@ under the License. - + registerTemplate @@ -3310,8 +3310,8 @@ under the License. - - + + listSystemVms @@ -3389,7 +3389,7 @@ under the License. - + rebootSystemVm @@ -3401,7 +3401,7 @@ under the License. - + stopSystemVm @@ -3412,8 +3412,8 @@ under the License. consoleid - - + + startSystemVm @@ -3424,9 +3424,9 @@ under the License. consoleid - - - + + + deleteIso @@ -3450,7 +3450,7 @@ under the License. - + deleteTemplate @@ -3479,5 +3479,5 @@ under the License. - + diff --git a/test/metadata/func/regression_user.xml b/test/metadata/func/regression_user.xml index aac4d585f07..c58c848e9d5 100644 --- a/test/metadata/func/regression_user.xml +++ b/test/metadata/func/regression_user.xml @@ -170,7 +170,7 @@ under the License. accountname - + id @@ -215,7 +215,7 @@ under the License. domain ROOT - + @@ -295,7 +295,7 @@ under the License. ---> +--> registerUserKeys @@ -314,8 +314,8 @@ under the License. secretkey - - + + createNetwork [Creating default network] @@ -352,7 +352,7 @@ under the License. - + listAccounts @@ -446,9 +446,9 @@ under the License. templateavailable - + + - deployVirtualMachine @@ -466,7 +466,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -490,7 +490,7 @@ under the License. networkids networkid - + @@ -542,8 +542,8 @@ under the License. - - + + listVirtualMachines @@ -597,8 +597,8 @@ under the License. group1 - - + + listRouters @@ -690,9 +690,9 @@ under the License. Running - - - + + + associateIpAddress true @@ -703,7 +703,7 @@ under the License. globalzoneid - + id nonsourcenatpublicipid @@ -729,9 +729,9 @@ under the License. - + - + createLoadBalancerRule @@ -797,9 +797,9 @@ under the License. accountname - - - + + + listLoadBalancerRules @@ -807,8 +807,8 @@ under the License. 988 false - - + + assignToLoadBalancerRule @@ -824,8 +824,8 @@ under the License. vmid - - + + deleteLoadBalancerRule @@ -837,19 +837,19 @@ under the License. lbid - - + + listLoadBalancerRules true true - + createLoadBalancerRule true - + name lbname @@ -912,8 +912,8 @@ under the License. accountname - - + + assignToLoadBalancerRule true @@ -927,9 +927,9 @@ under the License. vmid - - - + + + listLoadBalancerRuleInstances @@ -942,8 +942,8 @@ under the License. lbid - - + + removeFromLoadBalancerRule @@ -963,8 +963,8 @@ under the License. accountname - - + + listLoadBalancerRuleInstances true @@ -975,13 +975,13 @@ under the License. lbid - - + + - + + +--> + + +--> + +--> - + +--> + + +--> - + +--> + + +--> + +--> + +--> - + +--> + listVirtualMachines @@ -1322,8 +1322,8 @@ under the License. - - + + rebootVirtualMachine @@ -1336,7 +1336,7 @@ under the License. - + listVirtualMachines true @@ -1353,8 +1353,8 @@ under the License. - - + + stopVirtualMachine @@ -1367,7 +1367,7 @@ under the License. - + listVirtualMachines true @@ -1384,9 +1384,9 @@ under the License. - - - + + + @@ -1408,7 +1408,7 @@ under the License. - + listVolumes @@ -1428,7 +1428,7 @@ under the License. - + detachVolume @@ -1440,7 +1440,7 @@ under the License. - + listVolumes true @@ -1455,8 +1455,8 @@ under the License. - - + + createVolume @@ -1473,7 +1473,7 @@ under the License. diskofferingid globaldiskofferingid - + @@ -1481,9 +1481,9 @@ under the License. datavolumeid - - - + + + attachVolume @@ -1499,7 +1499,7 @@ under the License. - + listVolumes true @@ -1515,8 +1515,8 @@ under the License. - - + + createVolume @@ -1532,7 +1532,7 @@ under the License. diskofferingid globaldiskofferingid - + @@ -1540,8 +1540,8 @@ under the License. datavolumeid1 - - + + deleteVolume true @@ -1551,8 +1551,8 @@ under the License. datavolumeid1 - - + + listVolumes true @@ -1562,10 +1562,10 @@ under the License. datavolumeid1 - - + - + + createSnapshot @@ -1597,7 +1597,7 @@ under the License. - + listSnapshots true @@ -1609,7 +1609,7 @@ under the License. - + deleteSnapshot @@ -1622,7 +1622,7 @@ under the License. - + listSnapshots @@ -1636,7 +1636,7 @@ under the License. - + createSnapshot @@ -1654,7 +1654,7 @@ under the License. - + createTemplate true @@ -1703,7 +1703,7 @@ under the License. - + listTemplates @@ -1745,7 +1745,7 @@ under the License. - + updateTemplate @@ -1766,7 +1766,7 @@ under the License. - + listTemplates true @@ -1788,8 +1788,8 @@ under the License. - - + + listTemplatePermissions @@ -1808,8 +1808,8 @@ under the License. - - + + updateTemplatePermissions @@ -1826,7 +1826,7 @@ under the License. - + listTemplates true @@ -1848,8 +1848,8 @@ under the License. - - + + deleteTemplate @@ -1862,7 +1862,7 @@ under the License. - + listTemplates true @@ -1878,7 +1878,7 @@ under the License. - + stopVirtualMachine true @@ -1890,7 +1890,7 @@ under the License. - + changeServiceForVirtualMachine @@ -1907,7 +1907,7 @@ under the License. - + listVirtualMachines true @@ -1928,8 +1928,8 @@ under the License. - - + + resetPasswordForVirtualMachine @@ -1951,7 +1951,7 @@ under the License. - + listVirtualMachines true @@ -1968,7 +1968,7 @@ under the License. - + listVirtualMachines @@ -1986,7 +1986,7 @@ under the License. - + startVirtualMachine true @@ -2039,7 +2039,7 @@ under the License. - + listVirtualMachines true @@ -2056,7 +2056,7 @@ under the License. - + updateVirtualMachine @@ -2072,7 +2072,7 @@ under the License. - + listVirtualMachines true @@ -2090,7 +2090,7 @@ under the License. - + updateVirtualMachine true @@ -2105,7 +2105,7 @@ under the License. - + listVirtualMachines true @@ -2123,17 +2123,17 @@ under the License. - - - + + + listPublicIpAddresses true 547 - - + + disassociateIpAddress @@ -2146,15 +2146,15 @@ under the License. - - + + listEvents true 40 - + destroyVirtualMachine @@ -2167,9 +2167,9 @@ under the License. - - - + + + registerIso true @@ -2236,8 +2236,8 @@ under the License. - - + + listIsos true @@ -2250,7 +2250,7 @@ under the License. - + registerTemplate @@ -2320,8 +2320,8 @@ under the License. - - + + deleteIso @@ -2347,7 +2347,7 @@ under the License. - + deleteTemplate @@ -2378,5 +2378,5 @@ under the License. - + diff --git a/test/metadata/func/regression_works.xml b/test/metadata/func/regression_works.xml index 731f498ccac..0b2f7543874 100644 --- a/test/metadata/func/regression_works.xml +++ b/test/metadata/func/regression_works.xml @@ -18,10 +18,10 @@ under the License. --> - - + + - + createAccount [Create the Account and a User for the account] @@ -59,7 +59,7 @@ under the License. password - + id @@ -164,11 +164,11 @@ under the License. - + - + listUsers 5 [List the Created User in (3)] @@ -177,7 +177,7 @@ under the License. accountname - + id @@ -222,14 +222,14 @@ under the License. domain ROOT - + - - - + + + - + createUser 3 [Create User Command] @@ -261,9 +261,9 @@ under the License. email nimbus-user@gmail.com - + - + id @@ -312,7 +312,7 @@ under the License. - + @@ -324,7 +324,7 @@ under the License. accountname - + id @@ -429,7 +429,7 @@ under the License. - + @@ -473,7 +473,7 @@ under the License. usersecretkey - + id @@ -534,7 +534,7 @@ under the License. - + @@ -606,11 +606,11 @@ under the License. - + - - + @@ -753,7 +753,7 @@ under the License. - + @@ -825,7 +825,7 @@ under the License. - + @@ -945,7 +945,7 @@ under the License. state locked - + @@ -963,7 +963,7 @@ under the License. domainid 1 - + @@ -1065,7 +1065,7 @@ under the License. state enabled - + @@ -1189,7 +1189,7 @@ under the License. state disabled - + @@ -1207,7 +1207,7 @@ under the License. domainid 1 - + @@ -1309,7 +1309,7 @@ under the License. state enabled - + @@ -1325,7 +1325,7 @@ under the License. domainname - + name @@ -1366,7 +1366,7 @@ under the License. domainname - + id @@ -1414,7 +1414,7 @@ under the License. newdomainname - + id @@ -1456,7 +1456,7 @@ under the License. 1 - + domain 0 @@ -1486,8 +1486,8 @@ under the License. - - + + @@ -1503,7 +1503,7 @@ under the License. true - + success @@ -1528,7 +1528,7 @@ under the License. 1 - + template 0 @@ -1586,7 +1586,7 @@ under the License. size - debian50templatesize + debian50templatesize account @@ -1619,7 +1619,7 @@ under the License. domainid 1 - + @@ -1829,7 +1829,7 @@ under the License. offerha false - + @@ -1867,7 +1867,7 @@ under the License. vlan - guestcidraddress + guestcidraddress networktype @@ -2015,7 +2015,7 @@ under the License. - + sleep.sh @@ -2026,7 +2026,7 @@ under the License. 60 - + @@ -3432,7 +3432,7 @@ under the License. serviceofferingid - globalserviceofferingid + globalserviceofferingid serviceofferingname @@ -3440,7 +3440,7 @@ under the License. serviceofferingdisplaytext - + @@ -3553,7 +3553,7 @@ under the License. destroyed false - + @@ -3648,7 +3648,7 @@ under the License. state Created - + account accountname @@ -3764,7 +3764,7 @@ under the License. state Created - + account accountname @@ -3812,7 +3812,7 @@ under the License. destroyed false - + @@ -3956,7 +3956,7 @@ under the License. intervaltype MANUAL - + @@ -4066,7 +4066,7 @@ under the License. - + createTemplate 958 [Create Template from Snapshot] @@ -4119,7 +4119,7 @@ under the License. isready true - + passwordenabled false @@ -4157,7 +4157,7 @@ under the License. domainid 1 - + @@ -4204,7 +4204,7 @@ under the License. hypervisor XenServer - + @@ -4285,11 +4285,11 @@ under the License. isextractable true - + - - + + sleep.sh @@ -4300,8 +4300,8 @@ under the License. 300 - - + + listTemplates @@ -4347,7 +4347,7 @@ under the License. format VHD - + isfeatured false @@ -4394,7 +4394,7 @@ under the License. domain ROOT - + @@ -4508,7 +4508,7 @@ under the License. 240 - + listTemplates @@ -4711,7 +4711,7 @@ under the License. - + - @@ -8101,7 +8101,7 @@ under the License. state Running - + @@ -8190,7 +8190,7 @@ under the License. state Running - + @@ -8212,7 +8212,7 @@ under the License. systemvmtype consoleproxy - + zoneid globalzoneid @@ -8270,7 +8270,7 @@ under the License. state Stopped - + @@ -8358,7 +8358,7 @@ under the License. state Running - + @@ -8384,7 +8384,7 @@ under the License. privateisoid - + diff --git a/test/metadata/func/resource_limits.xml b/test/metadata/func/resource_limits.xml index e503a03666d..838ec93144a 100644 --- a/test/metadata/func/resource_limits.xml +++ b/test/metadata/func/resource_limits.xml @@ -79,17 +79,17 @@ under the License. account accountname - + id userid - + - - + updateResourceLimit Setup VMs Limit for Account Test Case @@ -166,10 +166,10 @@ under the License. 2 - + - + updateResourceLimit Setup Public-Ips Limit for Account Test Case @@ -200,10 +200,10 @@ under the License. 1 - - + + - + updateResourceLimit Setup Volumes Limit for Account Test Case @@ -234,10 +234,10 @@ under the License. 6 - + - + updateResourceLimit Setup Snapshots Limit for Account Test Case @@ -268,7 +268,7 @@ under the License. 2 - + @@ -302,9 +302,9 @@ under the License. 2 - - - + + + registerUserKeys @@ -325,8 +325,8 @@ under the License. secretkey - - + + createNetwork [Creating default network] @@ -374,7 +374,7 @@ under the License. diskofferingid globaldiskofferingid - + serviceofferingid globalserviceofferingid @@ -386,11 +386,11 @@ under the License. zoneid globalzoneid - + account accountname - + domainid 1 @@ -406,7 +406,7 @@ under the License. networkids networkid - + @@ -424,7 +424,7 @@ under the License. diskofferingid globaldiskofferingid - + serviceofferingid globalserviceofferingid @@ -436,15 +436,15 @@ under the License. zoneid globalzoneid - + account accountname - + domainid 1 - + displayname ResourceLimits-VM-2 @@ -465,38 +465,38 @@ under the License. - + - associateIpAddress + associateIpAddress Associate second IP Test Case true - + zoneid globalzoneid - + account accountname - + domainid 1 - + - + ipaddress ipid - - - + + + @@ -504,7 +504,7 @@ under the License. createVolume Create Fifth Volume Test Case true - + name @@ -513,29 +513,29 @@ under the License. zoneid globalzoneid - + account accountname - + domainid 1 - + diskofferingid globaldiskofferingid - + - + id volid1 - - + + attachVolume @@ -550,7 +550,7 @@ under the License. - + createVolume Create Sixth Volume Test Case @@ -563,19 +563,19 @@ under the License. zoneid globalzoneid - + account accountname - + domainid 1 - + diskofferingid globaldiskofferingid - + @@ -583,7 +583,7 @@ under the License. volid2 - + @@ -599,7 +599,7 @@ under the License. - + createSnapshot @@ -635,7 +635,7 @@ under the License. snpid - + @@ -666,7 +666,7 @@ under the License. zoneid globalzoneid - + account accountname @@ -678,7 +678,7 @@ under the License. hypervisor globalhypervisortype - + @@ -716,7 +716,7 @@ under the License. zoneid globalzoneid - + account accountname @@ -728,7 +728,7 @@ under the License. hypervisor globalhypervisortype - + @@ -749,7 +749,7 @@ under the License. diskofferingid globaldiskofferingid - + serviceofferingid globalserviceofferingid @@ -761,11 +761,11 @@ under the License. zoneid globalzoneid - + account accountname - + domainid 1 @@ -773,7 +773,7 @@ under the License. networkids network - + @@ -782,11 +782,11 @@ under the License. - + - associateIpAddress + associateIpAddress Associate Second IP Failure Test Case true true @@ -794,25 +794,25 @@ under the License. zoneid globalzoneid - + account accountname - + domainid 1 - + - + ipaddress ipid - - + + @@ -829,29 +829,29 @@ under the License. zoneid globalzoneid - + account accountname - + domainid 1 - + diskofferingid globaldiskofferingid - + - + id volid3 - - + + listVolumes @@ -873,7 +873,7 @@ under the License. - + createSnapshot Create Third Snapshot Failure Test Case @@ -924,7 +924,7 @@ under the License. zoneid globalzoneid - + account accountname @@ -936,7 +936,7 @@ under the License. hypervisor globalhypervisortype - + @@ -950,14 +950,14 @@ under the License. deleteAccount Clean up account test case - + id accountname - + @@ -1023,15 +1023,15 @@ under the License. account accountname - + id userid - + - - + updateResourceLimit Failure in Setting Up VMs Limit for Admin Account Test Case true @@ -1108,10 +1108,10 @@ under the License. 2 - + - + updateResourceLimit Failure in Setting Up Public-Ips Limit for Admin Account Test Case true @@ -1143,10 +1143,10 @@ under the License. 1 - - + + - + updateResourceLimit Failure in Setting Up Volumes Limit for Admin Account Test Case true @@ -1178,10 +1178,10 @@ under the License. 6 - + - + updateResourceLimit Failure in Setting up Snapshots Limit for Admin Account Test Case true @@ -1248,9 +1248,9 @@ under the License. 2 - - - + + + registerUserKeys @@ -1271,7 +1271,7 @@ under the License. secretkey - + createNetwork @@ -1309,7 +1309,7 @@ under the License. - + @@ -1320,7 +1320,7 @@ under the License. diskofferingid globaldiskofferingid - + serviceofferingid globalserviceofferingid @@ -1332,11 +1332,11 @@ under the License. zoneid globalzoneid - + account accountname - + domainid 1 @@ -1352,7 +1352,7 @@ under the License. networkids networkid - + @@ -1370,7 +1370,7 @@ under the License. diskofferingid globaldiskofferingid - + serviceofferingid globalserviceofferingid @@ -1382,11 +1382,11 @@ under the License. zoneid globalzoneid - + account accountname - + domainid 1 @@ -1402,7 +1402,7 @@ under the License. networkids networkid - + @@ -1411,43 +1411,43 @@ under the License. - + - associateIpAddress + associateIpAddress Associate second IP Test Case true - + zoneid globalzoneid - + account accountname - + domainid 1 - + - + ipaddress ipid - - + + createVolume Create Fifth Volume Test Case true - + name @@ -1456,30 +1456,30 @@ under the License. zoneid globalzoneid - + account accountname - + domainid 1 - + diskofferingid globaldiskofferingid - + - + id volid1 - - - + + + attachVolume @@ -1492,8 +1492,8 @@ under the License. vmid1 - - + + createVolume Create Sixth Volume Test Case @@ -1506,19 +1506,19 @@ under the License. zoneid globalzoneid - + account accountname - + domainid 1 - + diskofferingid globaldiskofferingid - + @@ -1526,7 +1526,7 @@ under the License. volid2 - + @@ -1542,7 +1542,7 @@ under the License. - + createSnapshot @@ -1609,7 +1609,7 @@ under the License. zoneid globalzoneid - + account accountname @@ -1621,7 +1621,7 @@ under the License. hypervisor globalhypervisortype - + @@ -1659,7 +1659,7 @@ under the License. zoneid globalzoneid - + account accountname @@ -1671,7 +1671,7 @@ under the License. hypervisor globalhypervisortype - + @@ -1687,12 +1687,12 @@ under the License. deployVirtualMachine Deploy VM3 Failure Avoidance test case true - + diskofferingid globaldiskofferingid - + serviceofferingid globalserviceofferingid @@ -1704,11 +1704,11 @@ under the License. zoneid globalzoneid - + account accountname - + domainid 1 @@ -1724,7 +1724,7 @@ under the License. networkids networkid - + @@ -1733,37 +1733,37 @@ under the License. - + - associateIpAddress + associateIpAddress Associate Second IP Failure Avoidance Test Case true - + zoneid globalzoneid - + account accountname - + domainid 1 - + - + ipaddress ipid - - + + @@ -1771,7 +1771,7 @@ under the License. createVolume Create Seventh Volume Failure Avoidance Test Case true - + name @@ -1780,31 +1780,31 @@ under the License. zoneid globalzoneid - + account accountname - + domainid 1 - + diskofferingid globaldiskofferingid - + - + id volid3 - - - + + + createSnapshot Create Third Snapshot Failure Test Case @@ -1855,7 +1855,7 @@ under the License. zoneid globalzoneid - + account accountname @@ -1867,8 +1867,8 @@ under the License. hypervisor globalhypervisortype - - + + @@ -1882,13 +1882,13 @@ under the License. deleteAccount Clean up admin account test case - + id accountid - + diff --git a/test/metadata/func/roughflatstress.xml b/test/metadata/func/roughflatstress.xml index 841190c496f..291d434348a 100644 --- a/test/metadata/func/roughflatstress.xml +++ b/test/metadata/func/roughflatstress.xml @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> - + createAccount [Create the Account and a User for the account] @@ -66,7 +66,7 @@ under the License. - + listUsers [List the User of the account] @@ -99,7 +99,7 @@ under the License. - + registerUserKeys Registering the First User @@ -120,7 +120,7 @@ under the License. - + createSecurityGroup true @@ -149,7 +149,7 @@ under the License. - + authorizeSecurityGroupIngress true @@ -185,7 +185,7 @@ under the License. --> - + listSecurityGroups true @@ -211,7 +211,7 @@ under the License. - + deployVirtualMachine true @@ -244,7 +244,7 @@ under the License. domainid globaldomainid - + --> @@ -254,10 +254,10 @@ under the License. ipaddress getvmip1 - + - + sleep.sh @@ -268,8 +268,8 @@ under the License. 120 - - + + ssh.sh @@ -285,7 +285,7 @@ under the License. - + sleep.sh @@ -296,8 +296,8 @@ under the License. 60 - - + + revokeSecurityGroupIngress true @@ -309,7 +309,7 @@ under the License. - +--> - + createSecurityGroup true @@ -358,7 +358,7 @@ under the License. - + authorizeSecurityGroupIngress true @@ -375,7 +375,7 @@ under the License. usersecuritygrouplist[0].group getsecuritygroupname1 - + endport 22 @@ -398,8 +398,8 @@ under the License. --> - - + + authorizeSecurityGroupIngress true @@ -435,7 +435,7 @@ under the License. --> - + listSecurityGroups true @@ -461,7 +461,7 @@ under the License. - + deployVirtualMachine true @@ -494,7 +494,7 @@ under the License. domainid globaldomainid - + --> @@ -504,10 +504,10 @@ under the License. ipaddress getvmip2 - + - + sleep.sh @@ -518,8 +518,8 @@ under the License. 120 - - + + ssh.sh @@ -535,7 +535,7 @@ under the License. - + sleep.sh @@ -546,8 +546,8 @@ under the License. 60 - - + + revokeSecurityGroupIngress true @@ -559,7 +559,7 @@ under the License. - + listSecurityGroups true @@ -585,7 +585,7 @@ under the License. - + revokeSecurityGroupIngress true @@ -597,8 +597,8 @@ under the License. - - +--> destroyVirtualMachine true @@ -627,7 +627,7 @@ under the License. - + sleep.sh @@ -651,7 +651,7 @@ under the License. - + sleep.sh @@ -663,9 +663,9 @@ under the License. - - - + + + deleteUser Deleting the user @@ -675,8 +675,8 @@ under the License. getuserid1 - - + + deleteAccount Delete Account @@ -686,6 +686,6 @@ under the License. getaccountid - - + + diff --git a/test/metadata/func/roughregression.xml b/test/metadata/func/roughregression.xml index f6de2323557..64c120a8bd4 100644 --- a/test/metadata/func/roughregression.xml +++ b/test/metadata/func/roughregression.xml @@ -199,7 +199,7 @@ under the License. domain getdomainname1 - + @@ -243,7 +243,7 @@ under the License. - + @@ -380,7 +380,7 @@ under the License. - + createUser @@ -417,7 +417,7 @@ under the License. domainid globaldomainid - + @@ -794,7 +794,7 @@ under the License. state locked - + @@ -810,7 +810,7 @@ under the License. domainid globaldomainid - + @@ -912,7 +912,7 @@ under the License. state enabled - + @@ -974,7 +974,7 @@ under the License. vmavailable Unlimited - + ipavailable Unlimited @@ -1034,7 +1034,7 @@ under the License. state disabled - + @@ -1050,7 +1050,7 @@ under the License. domainid globaldomainid - + @@ -1152,7 +1152,7 @@ under the License. state enabled - + @@ -1189,7 +1189,7 @@ under the License. getdomainname2 - + id @@ -1261,8 +1261,8 @@ under the License. false - - + + @@ -1274,7 +1274,7 @@ under the License. globaldomainid - + domain 0 @@ -1304,7 +1304,7 @@ under the License. - + deleteDomain @@ -1319,7 +1319,7 @@ under the License. true - + success @@ -1342,7 +1342,7 @@ under the License. 1 - + template 0 @@ -1396,7 +1396,7 @@ under the License. size - debian50templatesize + debian50templatesize account @@ -1429,7 +1429,7 @@ under the License. domainid 1 - + @@ -1636,7 +1636,7 @@ under the License. offerha false - + @@ -1672,7 +1672,7 @@ under the License. vlan - guestcidraddress + guestcidraddress networktype @@ -1680,7 +1680,7 @@ under the License. - + @@ -1770,7 +1770,7 @@ under the License. - + deployVirtualMachine [2] deployVirtualMachine-TestCase @@ -1814,7 +1814,7 @@ under the License. domainid globaldomainid - + @@ -1823,7 +1823,7 @@ under the License. - + updateVirtualMachine [3] updateVirtualMachine-TestCase @@ -1850,9 +1850,9 @@ under the License. - + - + associateIpAddress [4] associateIpAddress-TestCase @@ -1881,7 +1881,7 @@ under the License. - + enableStaticNat [5] enableStaticNat-TestCase @@ -1896,7 +1896,7 @@ under the License. - + createIpForwardingRule [6] createIpForwardingRule-TestCase @@ -1922,10 +1922,10 @@ under the License. id getipfwdruleid1 - + - + sleep.sh @@ -1936,8 +1936,8 @@ under the License. 120 - - + + ssh.sh @@ -1953,7 +1953,7 @@ under the License. - + deleteIpForwardingRule [7] deleteIpForwardingRule-TestCase @@ -1964,7 +1964,7 @@ under the License. - + disableStaticNat [8] disableStaticNat-TestCase @@ -1975,7 +1975,7 @@ under the License. - + disassociateIpAddress [9] disassociateIpAddress-TestCase @@ -1986,7 +1986,7 @@ under the License. - + associateIpAddress [10] associateIpAddress-TestCase @@ -2015,7 +2015,7 @@ under the License. - + createPortForwardingRule [11] createPortForwardingRule-TestCase @@ -2058,7 +2058,7 @@ under the License. id getportfwdruleid1 - + @@ -2073,8 +2073,8 @@ under the License. 120 - - + + ssh.sh @@ -2090,7 +2090,7 @@ under the License. - + deletePortForwardingRule [12] deletePortForwardingRule-TestCase @@ -2101,7 +2101,7 @@ under the License. - + disassociateIpAddress [13] disassociateIpAddress-TestCase @@ -2112,7 +2112,7 @@ under the License. - + associateIpAddress [14] associateIpAddress-TestCase @@ -2141,7 +2141,7 @@ under the License. - + createLoadBalancerRule [15] createLoadBalancerRule-TestCase @@ -2174,7 +2174,7 @@ under the License. - + assignToLoadBalancerRule [16] assignToLoadBalancerRule-TestCase @@ -2189,7 +2189,7 @@ under the License. - + listVolumes @@ -2384,7 +2384,7 @@ under the License. - + createSnapshot [26] createSnapshotofROOTVolume-TestCase @@ -2409,7 +2409,7 @@ under the License. - + listSnapshots [27] listROOTVolumeSnapshot-TestCase @@ -2420,7 +2420,7 @@ under the License. - + listVolumes [26] listDATADISKVolumes-TestCase @@ -2466,7 +2466,7 @@ under the License. - + listSnapshots [29] listDATADISKVolumeSnapshot-TestCase @@ -2477,7 +2477,7 @@ under the License. - + createTemplate [30] createTemplateFromSnapshotTakenofROOTVolume-TestCase @@ -2518,7 +2518,7 @@ under the License. - + createTemplate [31] createTemplateFromSnapshotTakenofDATADISKVolume-TestCase @@ -2559,7 +2559,7 @@ under the License. - + createVolume [32] createVolumeFromSnapshotTakenofROOTVolume-TestCase @@ -2588,7 +2588,7 @@ under the License. - + createVolume [33] createVolumeFromSnapshotTakenofDATADISKVolume-TestCase @@ -2618,7 +2618,7 @@ under the License. - + attachVolume [34] attachVolume1-TestCase @@ -2633,7 +2633,7 @@ under the License. - + attachVolume [35] attachVolume2-TestCase @@ -2648,9 +2648,9 @@ under the License. - + - + detachVolume [36] detachVolume1-TestCase @@ -2661,7 +2661,7 @@ under the License. - + detachVolume [37] detachVolume2-TestCase @@ -2672,7 +2672,7 @@ under the License. - + attachVolume [34] attachVolume1-TestCase @@ -2687,7 +2687,7 @@ under the License. - + attachVolume [35] attachVolume2-TestCase @@ -2702,7 +2702,7 @@ under the License. - + stopVirtualMachine [40] stopVirtualMachine-TestCase @@ -2713,7 +2713,7 @@ under the License. - + updateVirtualMachine [41] updateVirtualMachine-TestCase @@ -2740,7 +2740,7 @@ under the License. - + detachVolume [36] detachVolume1-TestCase @@ -2751,7 +2751,7 @@ under the License. - + detachVolume [37] detachVolume2-TestCase @@ -2762,7 +2762,7 @@ under the License. - + createTemplate [44] createTemplateFromROOTVolume-TestCase @@ -2799,7 +2799,7 @@ under the License. - + startVirtualMachine [45] startVirtualMachine-TestCase @@ -2810,7 +2810,7 @@ under the License. - + rebootVirtualMachine [46] rebootVirtualMachine-TestCase @@ -2821,7 +2821,7 @@ under the License. - + createSnapshotPolicy [47] createHOURLYSnapshotPolicyForRootVolume-TestCase @@ -2848,7 +2848,7 @@ under the License. - + createSnapshotPolicy [48] createDAILYSnapshotPolicy-TestCase @@ -2875,7 +2875,7 @@ under the License. - + createSnapshotPolicy [49] createWEEKLYSnapshotPolicy-TestCase @@ -2902,7 +2902,7 @@ under the License. - + createSnapshotPolicy [50] createMONTHLYSnapshotPolicy-TestCase @@ -2935,7 +2935,7 @@ under the License. - + deleteSnapshotPolicies [51] deleteMONTHLYSnapshotPolicies-TestCase @@ -2946,7 +2946,7 @@ under the License. - + deleteVolume [52] deleteVolume1-TestCase @@ -2957,7 +2957,7 @@ under the License. - + deleteVolume [53] deleteVolume2-TestCase @@ -2970,7 +2970,7 @@ under the License. - + destroyVirtualMachine [54] destroyVirtualMachine-TestCase @@ -2981,7 +2981,7 @@ under the License. - + recoverVirtualMachine [55] recoverVirtualMachine-TestCase @@ -2992,7 +2992,7 @@ under the License. - + startVirtualMachine [56] startVirtualMachine-TestCase @@ -3003,7 +3003,7 @@ under the License. - + rebootVirtualMachine [57] rebootVirtualMachine-TestCase @@ -3014,7 +3014,7 @@ under the License. - + stopVirtualMachine [58] stopVirtualMachine-TestCase @@ -3025,7 +3025,7 @@ under the License. - + destroyVirtualMachine [59] destroyVirtualMachine-TestCase @@ -3036,7 +3036,7 @@ under the License. - + recoverVirtualMachine [60] recoverVirtualMachine-TestCase @@ -3047,7 +3047,7 @@ under the License. - + changeServiceForVirtualMachine [61] changeServiceForVirtualMachine-TestCase @@ -3062,7 +3062,7 @@ under the License. - + startVirtualMachine [62] startVirtualMachine-TestCase @@ -3073,7 +3073,7 @@ under the License. - + rebootVirtualMachine [63] rebootVirtualMachine-TestCase @@ -3084,7 +3084,7 @@ under the License. - + stopVirtualMachine [64] stopVirtualMachine-TestCase @@ -3095,7 +3095,7 @@ under the License. - + destroyVirtualMachine [65] destroyVirtualMachine-TestCase @@ -3106,7 +3106,7 @@ under the License. - + deployVirtualMachine [66] deployVirtualMachineFromTemplateCreatedFromSnapshotofROOTVolume-TestCase @@ -3166,7 +3166,7 @@ under the License. - + deleteTemplate [68] deleteTemplateofSnapshotTakenofDATAVolume-TestCase @@ -3181,7 +3181,7 @@ under the License. - + deleteTemplate [69] deleteTemplateCreatedFromROOTVolume-TestCase @@ -3196,7 +3196,7 @@ under the License. - + deleteSnapshot [70] deleteSnapshot-TestCase @@ -3207,7 +3207,7 @@ under the License. - + deleteSnapshot [71] deleteSnapshot-TestCase @@ -3248,9 +3248,9 @@ under the License. - + - + associateIpAddress [4] associateIpAddress-TestCase @@ -3279,7 +3279,7 @@ under the License. - + enableStaticNat [5] enableStaticNat-TestCase @@ -3294,7 +3294,7 @@ under the License. - + createIpForwardingRule [6] createIpForwardingRule-TestCase @@ -3320,10 +3320,10 @@ under the License. id getipfwdruleid1 - + - + sleep.sh @@ -3334,8 +3334,8 @@ under the License. 120 - - + + ssh.sh @@ -3351,7 +3351,7 @@ under the License. - + deleteIpForwardingRule [7] deleteIpForwardingRule-TestCase @@ -3362,7 +3362,7 @@ under the License. - + disableStaticNat [8] disableStaticNat-TestCase @@ -3373,7 +3373,7 @@ under the License. - + disassociateIpAddress [9] disassociateIpAddress-TestCase @@ -3384,7 +3384,7 @@ under the License. - + associateIpAddress [10] associateIpAddress-TestCase @@ -3413,7 +3413,7 @@ under the License. - + createPortForwardingRule [11] createPortForwardingRule-TestCase @@ -3456,7 +3456,7 @@ under the License. id getportfwdruleid1 - + @@ -3471,8 +3471,8 @@ under the License. 120 - - + + ssh.sh @@ -3488,7 +3488,7 @@ under the License. - + deletePortForwardingRule [12] deletePortForwardingRule-TestCase @@ -3499,7 +3499,7 @@ under the License. - + disassociateIpAddress [13] disassociateIpAddress-TestCase @@ -3510,7 +3510,7 @@ under the License. - + associateIpAddress [14] associateIpAddress-TestCase @@ -3539,7 +3539,7 @@ under the License. - + createLoadBalancerRule [15] createLoadBalancerRule-TestCase @@ -3572,7 +3572,7 @@ under the License. - + assignToLoadBalancerRule [16] assignToLoadBalancerRule-TestCase @@ -3587,7 +3587,7 @@ under the License. - + +--> deleteLoadBalancerRule [24] deleteLoadBalancerRule-TestCase @@ -3745,10 +3745,10 @@ under the License. id getldblcrule1 - + - + disassociateIpAddress [25] disassociateIpAddress-TestCase @@ -3759,7 +3759,7 @@ under the License. - + listVolumes @@ -3781,7 +3781,7 @@ under the License. - + createSnapshot [26] createSnapshotofROOTVolume-TestCase @@ -3806,7 +3806,7 @@ under the License. - + listSnapshots [27] listROOTVolumeSnapshot-TestCase @@ -3817,7 +3817,7 @@ under the License. - + listVolumes [26] listDATADISKVolumes-TestCase @@ -3863,7 +3863,7 @@ under the License. - + listSnapshots [29] listDATADISKVolumeSnapshot-TestCase @@ -3874,7 +3874,7 @@ under the License. - + createTemplate [30] createTemplateFromSnapshotTakenofROOTVolume-TestCase @@ -3915,7 +3915,7 @@ under the License. - + createTemplate [31] createTemplateFromSnapshotTakenofDATADISKVolume-TestCase @@ -3956,7 +3956,7 @@ under the License. - + createVolume [32] createVolumeFromSnapshotTakenofROOTVolume-TestCase @@ -3985,7 +3985,7 @@ under the License. - + createVolume [33] createVolumeFromSnapshotTakenofDATADISKVolume-TestCase @@ -4015,7 +4015,7 @@ under the License. - + attachVolume [34] attachVolume1-TestCase @@ -4030,7 +4030,7 @@ under the License. - + attachVolume [35] attachVolume2-TestCase @@ -4045,9 +4045,9 @@ under the License. - + - + detachVolume [36] detachVolume1-TestCase @@ -4058,7 +4058,7 @@ under the License. - + detachVolume [37] detachVolume2-TestCase @@ -4069,7 +4069,7 @@ under the License. - + attachVolume [34] attachVolume1-TestCase @@ -4084,7 +4084,7 @@ under the License. - + attachVolume [35] attachVolume2-TestCase @@ -4099,7 +4099,7 @@ under the License. - + stopVirtualMachine [40] stopVirtualMachine-TestCase @@ -4110,7 +4110,7 @@ under the License. - + updateVirtualMachine [41] updateVirtualMachine-TestCase @@ -4137,7 +4137,7 @@ under the License. - + detachVolume [36] detachVolume1-TestCase @@ -4148,7 +4148,7 @@ under the License. - + detachVolume [37] detachVolume2-TestCase @@ -4159,7 +4159,7 @@ under the License. - + createTemplate [44] createTemplateFromROOTVolume-TestCase @@ -4196,7 +4196,7 @@ under the License. - + startVirtualMachine [45] startVirtualMachine-TestCase @@ -4207,7 +4207,7 @@ under the License. - + rebootVirtualMachine [46] rebootVirtualMachine-TestCase @@ -4218,7 +4218,7 @@ under the License. - + createSnapshotPolicy [47] createHOURLYSnapshotPolicyForRootVolume-TestCase @@ -4245,7 +4245,7 @@ under the License. - + createSnapshotPolicy [48] createDAILYSnapshotPolicy-TestCase @@ -4272,7 +4272,7 @@ under the License. - + createSnapshotPolicy [49] createWEEKLYSnapshotPolicy-TestCase @@ -4299,7 +4299,7 @@ under the License. - + createSnapshotPolicy [50] createMONTHLYSnapshotPolicy-TestCase @@ -4332,7 +4332,7 @@ under the License. - + deleteSnapshotPolicies [51] deleteMONTHLYSnapshotPolicies-TestCase @@ -4343,7 +4343,7 @@ under the License. - + deleteVolume [52] deleteVolume1-TestCase @@ -4354,7 +4354,7 @@ under the License. - + deleteVolume [53] deleteVolume2-TestCase @@ -4367,7 +4367,7 @@ under the License. - + destroyVirtualMachine [54] destroyVirtualMachine-TestCase @@ -4378,7 +4378,7 @@ under the License. - + recoverVirtualMachine [55] recoverVirtualMachine-TestCase @@ -4389,7 +4389,7 @@ under the License. - + startVirtualMachine [56] startVirtualMachine-TestCase @@ -4400,7 +4400,7 @@ under the License. - + rebootVirtualMachine [57] rebootVirtualMachine-TestCase @@ -4411,7 +4411,7 @@ under the License. - + stopVirtualMachine [58] stopVirtualMachine-TestCase @@ -4422,7 +4422,7 @@ under the License. - + destroyVirtualMachine [59] destroyVirtualMachine-TestCase @@ -4433,7 +4433,7 @@ under the License. - + recoverVirtualMachine [60] recoverVirtualMachine-TestCase @@ -4444,7 +4444,7 @@ under the License. - + changeServiceForVirtualMachine [61] changeServiceForVirtualMachine-TestCase @@ -4459,7 +4459,7 @@ under the License. - + startVirtualMachine [62] startVirtualMachine-TestCase @@ -4470,7 +4470,7 @@ under the License. - + rebootVirtualMachine [63] rebootVirtualMachine-TestCase @@ -4481,7 +4481,7 @@ under the License. - + stopVirtualMachine [64] stopVirtualMachine-TestCase @@ -4492,7 +4492,7 @@ under the License. - + destroyVirtualMachine [65] destroyVirtualMachine-TestCase @@ -4503,7 +4503,7 @@ under the License. - + @@ -4511,7 +4511,7 @@ under the License. - + - + associateIpAddress [4] associateIpAddress-TestCase @@ -4623,7 +4623,7 @@ under the License. - + enableStaticNat [5] enableStaticNat-TestCase @@ -4638,7 +4638,7 @@ under the License. - + createIpForwardingRule [6] createIpForwardingRule-TestCase @@ -4664,10 +4664,10 @@ under the License. id getipfwdruleid1 - + - + sleep.sh @@ -4678,8 +4678,8 @@ under the License. 120 - - + + ssh.sh @@ -4695,7 +4695,7 @@ under the License. - + deleteIpForwardingRule [7] deleteIpForwardingRule-TestCase @@ -4706,7 +4706,7 @@ under the License. - + disableStaticNat [8] disableStaticNat-TestCase @@ -4717,7 +4717,7 @@ under the License. - + disassociateIpAddress [9] disassociateIpAddress-TestCase @@ -4728,7 +4728,7 @@ under the License. - + associateIpAddress [10] associateIpAddress-TestCase @@ -4757,7 +4757,7 @@ under the License. - + createPortForwardingRule [11] createPortForwardingRule-TestCase @@ -4800,7 +4800,7 @@ under the License. id getportfwdruleid1 - + @@ -4815,8 +4815,8 @@ under the License. 120 - - + + ssh.sh @@ -4832,7 +4832,7 @@ under the License. - + deletePortForwardingRule [12] deletePortForwardingRule-TestCase @@ -4843,7 +4843,7 @@ under the License. - + disassociateIpAddress [13] disassociateIpAddress-TestCase @@ -4854,7 +4854,7 @@ under the License. - + associateIpAddress [14] associateIpAddress-TestCase @@ -4883,7 +4883,7 @@ under the License. - + createLoadBalancerRule [15] createLoadBalancerRule-TestCase @@ -4916,7 +4916,7 @@ under the License. - + assignToLoadBalancerRule [16] assignToLoadBalancerRule-TestCase @@ -4931,7 +4931,7 @@ under the License. - + listVolumes @@ -5126,7 +5126,7 @@ under the License. - + createSnapshot [26] createSnapshotofROOTVolume-TestCase @@ -5151,7 +5151,7 @@ under the License. - + listSnapshots [27] listROOTVolumeSnapshot-TestCase @@ -5162,7 +5162,7 @@ under the License. - + listVolumes [26] listDATADISKVolumes-TestCase @@ -5208,7 +5208,7 @@ under the License. - + listSnapshots [29] listDATADISKVolumeSnapshot-TestCase @@ -5219,7 +5219,7 @@ under the License. - + createTemplate [30] createTemplateFromSnapshotTakenofROOTVolume-TestCase @@ -5260,7 +5260,7 @@ under the License. - + createTemplate [31] createTemplateFromSnapshotTakenofDATADISKVolume-TestCase @@ -5301,7 +5301,7 @@ under the License. - + createVolume [32] createVolumeFromSnapshotTakenofROOTVolume-TestCase @@ -5330,7 +5330,7 @@ under the License. - + createVolume [33] createVolumeFromSnapshotTakenofDATADISKVolume-TestCase @@ -5360,7 +5360,7 @@ under the License. - + attachVolume [34] attachVolume1-TestCase @@ -5375,7 +5375,7 @@ under the License. - + attachVolume [35] attachVolume2-TestCase @@ -5390,9 +5390,9 @@ under the License. - + - + detachVolume [36] detachVolume1-TestCase @@ -5403,7 +5403,7 @@ under the License. - + detachVolume [37] detachVolume2-TestCase @@ -5414,7 +5414,7 @@ under the License. - + attachVolume [34] attachVolume1-TestCase @@ -5429,7 +5429,7 @@ under the License. - + attachVolume [35] attachVolume2-TestCase @@ -5444,7 +5444,7 @@ under the License. - + stopVirtualMachine [40] stopVirtualMachine-TestCase @@ -5455,7 +5455,7 @@ under the License. - + updateVirtualMachine [41] updateVirtualMachine-TestCase @@ -5482,7 +5482,7 @@ under the License. - + detachVolume [36] detachVolume1-TestCase @@ -5493,7 +5493,7 @@ under the License. - + detachVolume [37] detachVolume2-TestCase @@ -5504,7 +5504,7 @@ under the License. - + createTemplate [44] createTemplateFromROOTVolume-TestCase @@ -5541,7 +5541,7 @@ under the License. - + startVirtualMachine [45] startVirtualMachine-TestCase @@ -5552,7 +5552,7 @@ under the License. - + rebootVirtualMachine [46] rebootVirtualMachine-TestCase @@ -5563,7 +5563,7 @@ under the License. - + createSnapshotPolicy [47] createHOURLYSnapshotPolicyForRootVolume-TestCase @@ -5590,7 +5590,7 @@ under the License. - + createSnapshotPolicy [48] createDAILYSnapshotPolicy-TestCase @@ -5617,7 +5617,7 @@ under the License. - + createSnapshotPolicy [49] createWEEKLYSnapshotPolicy-TestCase @@ -5644,7 +5644,7 @@ under the License. - + createSnapshotPolicy [50] createMONTHLYSnapshotPolicy-TestCase @@ -5677,7 +5677,7 @@ under the License. - + deleteSnapshotPolicies [51] deleteMONTHLYSnapshotPolicies-TestCase @@ -5688,7 +5688,7 @@ under the License. - + deleteVolume [52] deleteVolume1-TestCase @@ -5699,7 +5699,7 @@ under the License. - + deleteVolume [53] deleteVolume2-TestCase @@ -5712,7 +5712,7 @@ under the License. - + destroyVirtualMachine [54] destroyVirtualMachine-TestCase @@ -5723,7 +5723,7 @@ under the License. - + recoverVirtualMachine [55] recoverVirtualMachine-TestCase @@ -5734,7 +5734,7 @@ under the License. - + startVirtualMachine [56] startVirtualMachine-TestCase @@ -5745,7 +5745,7 @@ under the License. - + rebootVirtualMachine [57] rebootVirtualMachine-TestCase @@ -5756,7 +5756,7 @@ under the License. - + stopVirtualMachine [58] stopVirtualMachine-TestCase @@ -5767,7 +5767,7 @@ under the License. - + destroyVirtualMachine [59] destroyVirtualMachine-TestCase @@ -5778,7 +5778,7 @@ under the License. - + recoverVirtualMachine [60] recoverVirtualMachine-TestCase @@ -5789,7 +5789,7 @@ under the License. - + changeServiceForVirtualMachine [61] changeServiceForVirtualMachine-TestCase @@ -5804,7 +5804,7 @@ under the License. - + startVirtualMachine [62] startVirtualMachine-TestCase @@ -5815,7 +5815,7 @@ under the License. - + rebootVirtualMachine [63] rebootVirtualMachine-TestCase @@ -5826,7 +5826,7 @@ under the License. - + stopVirtualMachine [64] stopVirtualMachine-TestCase @@ -5837,7 +5837,7 @@ under the License. - + destroyVirtualMachine [65] destroyVirtualMachine-TestCase @@ -5848,7 +5848,7 @@ under the License. - + deployVirtualMachine [66] deployVirtualMachineFromTemplateCreatedFromSnapshotofROOTVolume-TestCase @@ -5908,7 +5908,7 @@ under the License. - + deleteTemplate [68] deleteTemplateofSnapshotTakenofDATAVolume-TestCase @@ -5923,7 +5923,7 @@ under the License. - + deleteTemplate [69] deleteTemplateCreatedFromROOTVolume-TestCase @@ -5938,7 +5938,7 @@ under the License. - + deleteSnapshot [70] deleteSnapshot-TestCase @@ -5949,7 +5949,7 @@ under the License. - + deleteSnapshot [71] deleteSnapshot-TestCase @@ -6008,5 +6008,5 @@ under the License. getaccountid - - + + diff --git a/test/metadata/func/sanity.xml b/test/metadata/func/sanity.xml index 3094abd136d..6316ed6d2ed 100644 --- a/test/metadata/func/sanity.xml +++ b/test/metadata/func/sanity.xml @@ -18,7 +18,7 @@ under the License. --> - @@ -84,7 +84,7 @@ under the License. - + createNetwork @@ -122,7 +122,7 @@ under the License. - + deployVirtualMachine [Deploy a Virtual Machine under the Account] @@ -167,8 +167,8 @@ under the License. - - + + associateIpAddress [Acquire an IP Address (Non-Source NAT*)] @@ -190,14 +190,14 @@ under the License. id nonsourcenatpublicipid - + ipaddress nonsourcenatpublicip - + disassociateIpAddress [Release the IP Address (Non-Source NAT*)] @@ -208,7 +208,7 @@ under the License. - + rebootVirtualMachine [Reboot Virtual Machine] @@ -219,7 +219,7 @@ under the License. - + stopVirtualMachine [Stop virtual machine] @@ -230,7 +230,7 @@ under the License. - + startVirtualMachine [Start virtual machine] @@ -247,8 +247,8 @@ under the License. - - + + listRouters [List Routers] @@ -272,9 +272,9 @@ under the License. routerid - - - + + + stopRouter [Stop router] @@ -313,7 +313,7 @@ under the License. - + listVirtualMachines [Verify that vm was destroyed] @@ -330,7 +330,7 @@ under the License. - + recoverVirtualMachine [Recover virtual machine] @@ -341,7 +341,7 @@ under the License. - + listVirtualMachines [Verify that machine was recovered] @@ -362,7 +362,7 @@ under the License. - + deleteAccount [Delete account] @@ -372,7 +372,7 @@ under the License. accountid - - - + + + diff --git a/test/metadata/func/securitygroups.xml b/test/metadata/func/securitygroups.xml index 3ecffbf8467..55fc32aa270 100644 --- a/test/metadata/func/securitygroups.xml +++ b/test/metadata/func/securitygroups.xml @@ -17,7 +17,7 @@ specific language governing permissions and limitations under the License. --> - @@ -78,7 +78,7 @@ under the License. - + registerUserKeys Registering the User @@ -99,7 +99,7 @@ under the License. - + createNetworkGroup true @@ -113,7 +113,7 @@ under the License. - + authorizeNetworkGroupIngress Add the First Ingress Rule @@ -148,7 +148,7 @@ under the License. - + deployVirtualMachine true @@ -182,7 +182,7 @@ under the License. - + sleep.sh @@ -193,8 +193,8 @@ under the License. 120 - - + + ssh.sh @@ -210,7 +210,7 @@ under the License. - + sleep.sh @@ -221,8 +221,8 @@ under the License. 60 - - + + stopVirtualMachine true @@ -234,7 +234,7 @@ under the License. - + startVirtualMachine true @@ -246,7 +246,7 @@ under the License. - + rebootVirtualMachine true @@ -293,7 +293,7 @@ under the License. - + ssh.sh @@ -310,9 +310,9 @@ under the License. - + - + authorizeNetworkGroupIngress Add the Second Ingress Rule @@ -347,7 +347,7 @@ under the License. - + deployVirtualMachine true @@ -381,7 +381,7 @@ under the License. - + sleep.sh @@ -392,8 +392,8 @@ under the License. 120 - - + + ssh.sh @@ -410,7 +410,7 @@ under the License. - + revokeNetworkGroupIngress Revoke The Second Ingress Rule @@ -447,7 +447,7 @@ under the License. - + authorizeNetworkGroupIngress Add the Third Ingress Rule @@ -482,7 +482,7 @@ under the License. - + deployVirtualMachine true @@ -516,7 +516,7 @@ under the License. - + sleep.sh @@ -527,8 +527,8 @@ under the License. 120 - - + + ssh.sh @@ -545,7 +545,7 @@ under the License. - + revokeNetworkGroupIngress Revoke The Third Ingress Rule @@ -580,9 +580,9 @@ under the License. - + - + authorizeNetworkGroupIngress Add the Fourth Ingress Rule @@ -617,7 +617,7 @@ under the License. - + deployVirtualMachine true @@ -651,7 +651,7 @@ under the License. - + sleep.sh @@ -662,8 +662,8 @@ under the License. 120 - - + + ssh.sh @@ -680,7 +680,7 @@ under the License. - + revokeNetworkGroupIngress Revoke The Fourth Ingress Rule @@ -715,8 +715,8 @@ under the License. - - + + deleteNetworkGroup @@ -729,7 +729,7 @@ under the License. - + destroyVirtualMachine true @@ -741,7 +741,7 @@ under the License. - + sleep.sh @@ -752,10 +752,10 @@ under the License. 120 - - - - + + + + deleteUser Deleting the user @@ -765,6 +765,6 @@ under the License. userid - + diff --git a/test/metadata/func/sharedstorage_volume_test.xml b/test/metadata/func/sharedstorage_volume_test.xml index c34afc47baf..697887998ec 100644 --- a/test/metadata/func/sharedstorage_volume_test.xml +++ b/test/metadata/func/sharedstorage_volume_test.xml @@ -78,12 +78,12 @@ under the License. account accountvar - + id userid - + @@ -126,7 +126,7 @@ under the License. ---> +--> registerUserKeys @@ -145,7 +145,7 @@ under the License. secretkey - + createNetwork @@ -200,7 +200,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -208,7 +208,7 @@ under the License. account accountvar - + domainid 1 @@ -224,7 +224,7 @@ under the License. networkids networkid - + @@ -233,7 +233,7 @@ under the License. - + createVolume true @@ -248,7 +248,7 @@ under the License. diskofferingid globaldiskofferingid - + @@ -257,7 +257,7 @@ under the License. - + attachVolume true @@ -273,7 +273,7 @@ under the License. - + @@ -286,7 +286,7 @@ under the License. - + createVolume true @@ -301,7 +301,7 @@ under the License. diskofferingid globaldiskofferingid - + @@ -310,7 +310,7 @@ under the License. - + attachVolume true @@ -326,8 +326,8 @@ under the License. - - + + createVolume @@ -344,7 +344,7 @@ under the License. diskofferingid globaldiskofferingid - + @@ -352,9 +352,9 @@ under the License. DATADISK - - - + + + deployVirtualMachine @@ -371,7 +371,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -379,7 +379,7 @@ under the License. account accountvar - + domainid 1 @@ -395,7 +395,7 @@ under the License. networkids networkid - + @@ -404,7 +404,7 @@ under the License. - + listVolumes @@ -424,7 +424,7 @@ under the License. - + detachVolume true @@ -458,7 +458,7 @@ under the License. - + detachVolume true @@ -471,8 +471,8 @@ under the License. - - + + deployVirtualMachine @@ -489,7 +489,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -497,7 +497,7 @@ under the License. account accountvar - + domainid 1 @@ -513,7 +513,7 @@ under the License. networkids networkid - + @@ -522,7 +522,7 @@ under the License. - + createVolume true @@ -537,7 +537,7 @@ under the License. diskofferingid globaldiskofferingid - + @@ -546,7 +546,7 @@ under the License. - + createVolume true @@ -561,7 +561,7 @@ under the License. diskofferingid globaldiskofferingid - + @@ -570,7 +570,7 @@ under the License. - + createVolume true @@ -585,7 +585,7 @@ under the License. diskofferingid globaldiskofferingid - + @@ -594,7 +594,7 @@ under the License. - + createVolume true @@ -609,7 +609,7 @@ under the License. diskofferingid globaldiskofferingid - + @@ -618,7 +618,7 @@ under the License. - + createVolume true @@ -633,7 +633,7 @@ under the License. diskofferingid globaldiskofferingid - + @@ -642,7 +642,7 @@ under the License. - + attachVolume true @@ -657,7 +657,7 @@ under the License. - + attachVolume true @@ -672,7 +672,7 @@ under the License. - + attachVolume true @@ -687,7 +687,7 @@ under the License. - + attachVolume true @@ -702,7 +702,7 @@ under the License. - + attachVolume true @@ -732,7 +732,7 @@ under the License. - + stopVirtualMachine @@ -745,7 +745,7 @@ under the License. - + startVirtualMachine true @@ -757,8 +757,8 @@ under the License. - - + + createVolume @@ -774,7 +774,7 @@ under the License. diskofferingid globaldiskofferingid - + @@ -783,7 +783,7 @@ under the License. - + attachVolume true @@ -800,7 +800,7 @@ under the License. - + @@ -813,8 +813,8 @@ under the License. vmid - - + + listVolumes true @@ -830,8 +830,8 @@ under the License. - - + + deployVirtualMachine @@ -848,7 +848,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -856,7 +856,7 @@ under the License. account accountvar - + domainid 1 @@ -872,7 +872,7 @@ under the License. networkids networkid - + @@ -881,7 +881,7 @@ under the License. - + listVolumes @@ -901,7 +901,7 @@ under the License. - + detachVolume true @@ -912,7 +912,7 @@ under the License. - + rebootVirtualMachine true @@ -924,7 +924,7 @@ under the License. - + stopVirtualMachine @@ -936,7 +936,7 @@ under the License. - + startVirtualMachine true @@ -967,7 +967,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -975,7 +975,7 @@ under the License. account accountvar - + domainid 1 @@ -991,7 +991,7 @@ under the License. networkids networkid - + @@ -1000,7 +1000,7 @@ under the License. - + listVolumes @@ -1020,7 +1020,7 @@ under the License. - + detachVolume true @@ -1032,7 +1032,7 @@ under the License. - + listVolumes true @@ -1048,7 +1048,7 @@ under the License. - + attachVolume @@ -1064,7 +1064,7 @@ under the License. - + stopVirtualMachine true @@ -1075,7 +1075,7 @@ under the License. - + detachVolume true @@ -1087,7 +1087,7 @@ under the License. - + listVolumes true @@ -1103,7 +1103,7 @@ under the License. - + deployVirtualMachine @@ -1120,7 +1120,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -1128,7 +1128,7 @@ under the License. account accountvar - + domainid 1 @@ -1144,7 +1144,7 @@ under the License. networkids networkid - + @@ -1153,7 +1153,7 @@ under the License. - + deployVirtualMachine true @@ -1169,7 +1169,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -1177,7 +1177,7 @@ under the License. account accountvar - + domainid 1 @@ -1193,7 +1193,7 @@ under the License. networkids networkid - + @@ -1202,7 +1202,7 @@ under the License. - + createVolume true @@ -1217,7 +1217,7 @@ under the License. diskofferingid globaldiskofferingid - + @@ -1226,7 +1226,7 @@ under the License. - + attachVolume true @@ -1241,7 +1241,7 @@ under the License. - + attachVolume true @@ -1258,7 +1258,7 @@ under the License. - + destroyVirtualMachine @@ -1270,7 +1270,7 @@ under the License. - + createVolume true @@ -1285,7 +1285,7 @@ under the License. diskofferingid globaldiskofferingid - + @@ -1294,7 +1294,7 @@ under the License. - + attachVolume true @@ -1311,7 +1311,7 @@ under the License. - + listVolumes @@ -1332,7 +1332,7 @@ under the License. - + destroyVirtualMachine true @@ -1343,7 +1343,7 @@ under the License. - + detachVolume true @@ -1356,9 +1356,9 @@ under the License. - - - + + + deleteAccount Deleting Account as a part of cleanup diff --git a/test/metadata/func/snapshot_iso.xml b/test/metadata/func/snapshot_iso.xml index aabc8c113b4..6bddb393e71 100644 --- a/test/metadata/func/snapshot_iso.xml +++ b/test/metadata/func/snapshot_iso.xml @@ -18,38 +18,38 @@ under the License. --> - - + createUser Create a user - + username @@ -87,7 +87,7 @@ under the License. - + registerUserKeys Registering the user @@ -108,8 +108,8 @@ under the License. - - + + registerIso Register iso @@ -176,9 +176,9 @@ under the License. registerdisplay - - - + + + deployVirtualMachine Deploying VM from small diskOffering @@ -195,7 +195,7 @@ under the License. diskofferingid 5 - + templateid privateisoid @@ -224,7 +224,7 @@ under the License. - + listVolumes @@ -245,7 +245,7 @@ under the License. - + listVolumes @@ -265,7 +265,7 @@ under the License. - + sleep.sh @@ -277,7 +277,7 @@ under the License. 200 - + @@ -316,7 +316,7 @@ under the License. - + createTemplate @@ -346,7 +346,7 @@ under the License. - + deployVirtualMachine @@ -364,7 +364,7 @@ under the License. diskofferingid 5 - + templateid smalltemplateid @@ -394,7 +394,7 @@ under the License. - + createVolume Create a volume from smaller disk snapshot @@ -416,7 +416,7 @@ under the License. - + createVolume Create a volume from smaller disk snapshot @@ -456,7 +456,7 @@ under the License. - + attachVolume Attach small volume to a different VM @@ -472,7 +472,7 @@ under the License. - + listConfiguration Getting value of the expunge.delay configuration parameter @@ -489,8 +489,8 @@ under the License. - - + + rebootVirtualMachine @@ -502,7 +502,7 @@ under the License. - + stopVirtualMachine stop medium vm @@ -513,7 +513,7 @@ under the License. - + startVirtualMachine stop medium vm @@ -548,9 +548,9 @@ under the License. - - + + @@ -570,8 +570,8 @@ under the License. - - + + sleep.sh @@ -583,7 +583,7 @@ under the License. - + sleep.sh @@ -595,8 +595,8 @@ under the License. - - + + @@ -617,7 +617,7 @@ under the License. - + destroyVirtualMachine @@ -629,8 +629,8 @@ under the License. - - + + deleteUser @@ -642,5 +642,5 @@ under the License. - + diff --git a/test/metadata/func/snapshots.xml b/test/metadata/func/snapshots.xml index 578698ad67e..843b5dfe1c5 100644 --- a/test/metadata/func/snapshots.xml +++ b/test/metadata/func/snapshots.xml @@ -28,7 +28,7 @@ under the License. d.List the Data Disk of the Medium VM 5.Create a Snapshot from the root disk of the Small VM 6.Create a Snapshot from the data disk of the Small VM - 7.Create a Snapshot from the root disk of the Medium VM + 7.Create a Snapshot from the root disk of the Medium VM 8.Create a Snapshot from the data disk of the Medium VM 9.Create a Template from the snapshot taken of the root disk of the Small VM 10.Create a Template from the snapshot taken of the root disk of the Medium VM @@ -38,9 +38,9 @@ under the License. 14.Create a Volume from the snapshot taken of the root disk of the Medium VM 15.Attach the volume created from the snapshot taken of the root disk of the Small VM to the VM created from the template created from the snapshot taken of the root disk of the Small VM 16.Attach the volume created from the snapshot taken of the root disk of the Medium VM to the VM created from the template created from the snapshot taken of the root disk of the Medium VM - 17.Reboot,start,stop,destroy VM created from the template created from the snapshot taken of the root disk of the Small VM - 18.Reboot,start,stop,destroy VM created from the template created from the snapshot taken of the root disk of the Medium VM - 19.Clean Up + 17.Reboot,start,stop,destroy VM created from the template created from the snapshot taken of the root disk of the Small VM + 18.Reboot,start,stop,destroy VM created from the template created from the snapshot taken of the root disk of the Medium VM + 19.Clean Up --> @@ -103,20 +103,20 @@ under the License. account accountvar - + id userid - + - +--> registerUserKeys Registering the user @@ -173,8 +173,8 @@ under the License. secretkey - - + + createNetwork [Creating default network] @@ -211,7 +211,7 @@ under the License. - + deployVirtualMachine Deploying vm from small diskOffering @@ -228,7 +228,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -261,7 +261,7 @@ under the License. - + deployVirtualMachine Deploying vm from Medium disk offering @@ -278,7 +278,7 @@ under the License. diskofferingid mediumglobaldiskofferingid - + templateid globaltemplateid @@ -319,7 +319,7 @@ under the License. - + listVolumes @@ -339,7 +339,7 @@ under the License. - + listVolumes @@ -359,7 +359,7 @@ under the License. - + listVolumes @@ -379,7 +379,7 @@ under the License. - + listVolumes @@ -411,7 +411,7 @@ under the License. 200 - + @@ -431,7 +431,7 @@ under the License. - + createSnapshot Creating snapshot of Data disk of small vm @@ -449,7 +449,7 @@ under the License. - + createSnapshot Creating snapshot of ROOT disk of medium vm @@ -467,7 +467,7 @@ under the License. - + createSnapshot Creating snapshot of DATA disk of medium vm @@ -485,7 +485,7 @@ under the License. - + createTemplate @@ -515,7 +515,7 @@ under the License. - + createTemplate Creating template of ROOT snapshot of large vm @@ -544,7 +544,7 @@ under the License. - + deployVirtualMachine Deploy a vm from template created from snapshot of ROOT disk of small vm @@ -561,7 +561,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid smalltemplateid @@ -602,7 +602,7 @@ under the License. - + deployVirtualMachine Deploy a vm from template created from snapshot of ROOT disk of medium vm @@ -619,7 +619,7 @@ under the License. diskofferingid mediumglobaldiskofferinigid - + templateid largetemplateid @@ -703,8 +703,8 @@ under the License. largevolumeid - - + + attachVolume Attach small volume to the vm created from small snapshot @@ -720,7 +720,7 @@ under the License. - + attachVolume Attach medium volume to the vm created from medium snapshot @@ -736,8 +736,8 @@ under the License. - - + + rebootVirtualMachine @@ -749,7 +749,7 @@ under the License. - + stopVirtualMachine stop medium vm @@ -760,7 +760,7 @@ under the License. - + startVirtualMachine stop medium vm @@ -784,7 +784,7 @@ under the License. - + destroyVirtualMachine Destroy large vm @@ -796,7 +796,7 @@ under the License. - + @@ -808,9 +808,9 @@ under the License. accountid - + - - - + + diff --git a/test/metadata/func/snapshots_contd.xml b/test/metadata/func/snapshots_contd.xml index d0532cd89d2..c9b277cb696 100644 --- a/test/metadata/func/snapshots_contd.xml +++ b/test/metadata/func/snapshots_contd.xml @@ -18,14 +18,14 @@ under the License. --> - - + createUser Create a user - + username @@ -87,7 +87,7 @@ under the License. - + registerUserKeys Registering the user @@ -107,9 +107,9 @@ under the License. secretkey - - - + + + deployVirtualMachine Deploying VM from small diskOffering @@ -126,7 +126,7 @@ under the License. diskofferingid 5 - + templateid globaltemplateid @@ -155,7 +155,7 @@ under the License. - + listVolumes @@ -176,7 +176,7 @@ under the License. - + listVolumes @@ -196,7 +196,7 @@ under the License. - + sleep.sh @@ -208,7 +208,7 @@ under the License. 200 - + @@ -247,7 +247,7 @@ under the License. - + createTemplate @@ -277,7 +277,7 @@ under the License. - + deployVirtualMachine @@ -295,7 +295,7 @@ under the License. diskofferingid 5 - + templateid smalltemplateid @@ -325,7 +325,7 @@ under the License. - + createVolume Create a volume from smaller disk snapshot @@ -347,7 +347,7 @@ under the License. - + createVolume Create a volume from smaller disk snapshot @@ -369,7 +369,7 @@ under the License. - + createSnapshot Creating snapshot of Detached Volume @@ -406,7 +406,7 @@ under the License. - + attachVolume Attach small volume to a different VM @@ -422,9 +422,9 @@ under the License. - - - + + + rebootVirtualMachine @@ -436,7 +436,7 @@ under the License. - + stopVirtualMachine stop medium vm @@ -447,7 +447,7 @@ under the License. - + startVirtualMachine stop medium vm @@ -483,7 +483,7 @@ under the License. - + destroyVirtualMachine @@ -495,9 +495,9 @@ under the License. - - + + @@ -517,8 +517,8 @@ under the License. - - + + sleep.sh @@ -530,7 +530,7 @@ under the License. - + sleep.sh @@ -542,8 +542,8 @@ under the License. - - + + @@ -564,7 +564,7 @@ under the License. - + destroyVirtualMachine @@ -576,7 +576,7 @@ under the License. - + listConfiguration Getting value of the expunge.delay configuration parameter @@ -593,7 +593,7 @@ under the License. - + listConfiguration Getting value of the expunge.delay configuration parameter @@ -609,8 +609,8 @@ under the License. expunge.delay - - + + deleteUser @@ -622,5 +622,5 @@ under the License. - + diff --git a/test/metadata/func/static_nat.xml b/test/metadata/func/static_nat.xml index 144ad9d5ae0..7694affdab8 100644 --- a/test/metadata/func/static_nat.xml +++ b/test/metadata/func/static_nat.xml @@ -18,9 +18,9 @@ under the License. --> - + createUser - Create a regular user + Create a regular user username @@ -57,7 +57,7 @@ under the License. - + registerUserKeys Registering the user @@ -78,7 +78,7 @@ under the License. - + deployVirtualMachine Deploying virtual machine @@ -95,7 +95,7 @@ under the License. diskofferingid 5 - + templateid globaltemplateid @@ -127,9 +127,9 @@ under the License. vmipaddress - - - + + + deployVirtualMachine Deploying virtual machine @@ -146,7 +146,7 @@ under the License. diskofferingid 5 - + templateid globaltemplateid @@ -178,8 +178,8 @@ under the License. vmipaddress1 - - + + sleep.sh @@ -190,8 +190,8 @@ under the License. 60 - - + + listRouters 35 @@ -219,9 +219,9 @@ under the License. sourcenatpublicip - - - + + + associateIpAddress true @@ -231,15 +231,15 @@ under the License. globalzoneid - + ipaddress nonsourcenatpublicip - - + + createIpForwardingRule @@ -257,8 +257,8 @@ under the License. - - + + createIpForwardingRule @@ -274,14 +274,14 @@ under the License. vmid - + id ruleid - + ssh.sh @@ -297,8 +297,8 @@ under the License. - - + + deleteIpForwardingRule @@ -311,7 +311,7 @@ under the License. - + listIpForwardingRules true @@ -324,7 +324,7 @@ under the License. - + ssh.sh @@ -341,8 +341,8 @@ under the License. - - + + createIpForwardingRule @@ -358,14 +358,14 @@ under the License. vmid - + id ruleid - + listIpForwardingRules true @@ -378,7 +378,7 @@ under the License. - + listIpForwardingRules true @@ -391,8 +391,8 @@ under the License. - - + + listIpForwardingRules true @@ -405,7 +405,7 @@ under the License. - + disassociateIpAddress @@ -417,7 +417,7 @@ under the License. - + listIpForwardingRules true @@ -425,7 +425,7 @@ under the License. false - + associateIpAddress @@ -436,15 +436,15 @@ under the License. globalzoneid - + ipaddress nonsourcenatpublicip - - + + createIpForwardingRule true @@ -459,14 +459,14 @@ under the License. vmid - + id ruleid - + createIpForwardingRule true @@ -483,8 +483,8 @@ under the License. - - + + destroyVirtualMachine @@ -496,7 +496,7 @@ under the License. - + listConfigurations Getting expunge interval value @@ -513,7 +513,7 @@ under the License. - + sleep.sh @@ -524,15 +524,15 @@ under the License. expunge.interval - - + + listIpForwardingRules true true Test case 1140: static nat rules should be removed once corresponding vm is expunged - + @@ -544,14 +544,14 @@ under the License. globalzoneid - + ipaddress nonsourcenatpublicip1 - + associateIpAddress true @@ -561,14 +561,14 @@ under the License. globalzoneid - + ipaddress nonsourcenatpublicip2 - + createIpForwardingRule true @@ -584,7 +584,7 @@ under the License. - + createIpForwardingRule true @@ -600,8 +600,8 @@ under the License. - - + + ssh.sh @@ -617,8 +617,8 @@ under the License. - - + + ssh.sh @@ -634,8 +634,8 @@ under the License. - - + + rebootRouter @@ -647,7 +647,7 @@ under the License. - + ssh.sh @@ -675,8 +675,8 @@ under the License. routerid - - + + startRouter Starting router... @@ -686,8 +686,8 @@ under the License. routerid - - + + ssh.sh @@ -703,7 +703,7 @@ under the License. - + @@ -722,7 +722,7 @@ under the License. diskofferingid 5 - + templateid globaltemplateid @@ -754,8 +754,8 @@ under the License. vmipaddress1 - - + + sleep.sh @@ -766,8 +766,8 @@ under the License. 60 - - + + associateIpAddress true @@ -777,14 +777,14 @@ under the License. globalzoneid - + ipaddress nonsourcenatpublicip - - + + createPortForwardingRule true @@ -815,8 +815,8 @@ under the License. vmid - - + + ssh.sh @@ -832,7 +832,7 @@ under the License. - + createIpForwardingRule true @@ -847,14 +847,14 @@ under the License. vmid1 - + id ruleid - + ssh.sh @@ -870,7 +870,7 @@ under the License. - + deleteIpForwardingRule true @@ -882,7 +882,7 @@ under the License. - + ssh.sh @@ -898,9 +898,9 @@ under the License. - - - + + + deleteUser Deleting the user @@ -910,7 +910,7 @@ under the License. userid - + diff --git a/test/metadata/func/templatedwnldstress.xml b/test/metadata/func/templatedwnldstress.xml index 19d12a2d9ef..0edb82eb1fe 100644 --- a/test/metadata/func/templatedwnldstress.xml +++ b/test/metadata/func/templatedwnldstress.xml @@ -18,18 +18,18 @@ under the License. --> - @@ -76,7 +76,7 @@ under the License. - + createNetwork @@ -114,7 +114,7 @@ under the License. - + deployVirtualMachine [Deploy a Virtual Machine under the Account] @@ -159,7 +159,7 @@ under the License. - + listVolumes [List the ROOT Volume of the VM] @@ -180,7 +180,7 @@ under the License. - + stopVirtualMachine [Stop virtual machine] @@ -191,7 +191,7 @@ under the License. - + createTemplate [Create template from root volume] @@ -219,7 +219,7 @@ under the License. - + deployVirtualMachine [Deploying virtual machine from the Private Template] @@ -235,7 +235,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid privatetemplateid @@ -272,7 +272,7 @@ under the License. - + listHosts List host where vm is running @@ -289,7 +289,7 @@ under the License. - + select install_path from template_spool_ref true @@ -307,7 +307,7 @@ under the License. - + listvdi.sh @@ -323,7 +323,7 @@ under the License. - + destroyVirtualMachine Destroy virtual machine created from the private template @@ -333,9 +333,9 @@ under the License. vmid1 - - - + + + listConfigurations Getting expunge interval value @@ -352,7 +352,7 @@ under the License. - + updateConfiguration Updating storage.cleanup.interval @@ -367,7 +367,7 @@ under the License. - + listConfigurations Getting expunge interval value @@ -384,7 +384,7 @@ under the License. - + ms.sh @@ -411,9 +411,9 @@ under the License. expunge.interval - - - + + + sleep.sh @@ -424,8 +424,8 @@ under the License. expunge.interval - - + + sleep.sh @@ -436,8 +436,8 @@ under the License. storage.cleanup.interval - - + + sleep.sh @@ -448,10 +448,10 @@ under the License. storage.cleanup.interval - - + + - + listvdi.sh true @@ -470,7 +470,7 @@ under the License. - + deployVirtualMachine Deploying virtual machine from the private template @@ -486,7 +486,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid privatetemplateid @@ -523,7 +523,7 @@ under the License. - + listHosts List host where vm is running @@ -540,7 +540,7 @@ under the License. - + select install_path from template_spool_ref true @@ -558,7 +558,7 @@ under the License. - + listvdi.sh @@ -574,7 +574,7 @@ under the License. - + destroyVirtualMachine Destroy virtual machine created from the private template @@ -584,9 +584,9 @@ under the License. vmid1 - - - + + + listConfigurations Getting expunge interval value @@ -603,7 +603,7 @@ under the License. - + sleep.sh @@ -614,9 +614,9 @@ under the License. expunge.interval - - - + + + sleep.sh @@ -627,8 +627,8 @@ under the License. expunge.interval - - + + sleep.sh @@ -639,8 +639,8 @@ under the License. storage.cleanup.interval - - + + sleep.sh @@ -651,10 +651,10 @@ under the License. storage.cleanup.interval - - + + - + listvdi.sh true @@ -673,8 +673,8 @@ under the License. - - + + startVirtualMachine [Start virtual machine] @@ -691,7 +691,7 @@ under the License. - + rebootVirtualMachine [Reboot Virtual Machine] @@ -702,7 +702,7 @@ under the License. - + destroyVirtualMachine [Destroy virtual machine] @@ -713,7 +713,7 @@ under the License. - + listVirtualMachines [Verify that vm was destroyed] @@ -730,7 +730,7 @@ under the License. - + deleteTemplate Delete private template @@ -741,7 +741,7 @@ under the License. - + deleteAccount [Delete account] @@ -751,7 +751,7 @@ under the License. accountid - - - + + + diff --git a/test/metadata/func/userapi.xml b/test/metadata/func/userapi.xml index de03b9794da..67246cbb0bc 100644 --- a/test/metadata/func/userapi.xml +++ b/test/metadata/func/userapi.xml @@ -64,7 +64,7 @@ under the License. name accountname - + @@ -77,7 +77,7 @@ under the License. account accountname - + id @@ -86,10 +86,10 @@ under the License. username usernameparam - + - + createUser @@ -127,11 +127,11 @@ under the License. domainid 1 - + - - + + +--> @@ -243,7 +243,7 @@ under the License. password password - + +--> createUser @@ -296,7 +296,7 @@ under the License. 0 - username + username password @@ -317,7 +317,7 @@ under the License. domainid 1 - + @@ -326,7 +326,7 @@ under the License. seconduserid - + updateUser 593 @@ -356,7 +356,7 @@ under the License. - + deleteUser @@ -367,7 +367,7 @@ under the License. - + deleteUser 58 @@ -379,8 +379,8 @@ under the License. - - + + listUsers 59 @@ -392,7 +392,7 @@ under the License. - + listUsers @@ -405,7 +405,7 @@ under the License. - + updateUser @@ -421,7 +421,7 @@ under the License. - + updateUser @@ -437,7 +437,7 @@ under the License. - + createUser @@ -473,7 +473,7 @@ under the License. - + createUser @@ -512,8 +512,8 @@ under the License. - - + + createUser @@ -541,8 +541,8 @@ under the License. - - + + createUser 47 @@ -569,7 +569,7 @@ under the License. - + createUser 47 @@ -596,7 +596,7 @@ under the License. - + createUser 47 @@ -623,8 +623,8 @@ under the License. - - + + createDomain @@ -643,8 +643,8 @@ under the License. newdomainid - - + + createAccount [Create the Account and a User in the New Domain] @@ -690,7 +690,7 @@ under the License. name accountname1 - + @@ -703,7 +703,7 @@ under the License. account accountname1 - + id @@ -712,11 +712,11 @@ under the License. username usernameparam - + - - + +--> createUser 51 @@ -832,8 +832,8 @@ under the License. - - + + createUser @@ -871,7 +871,7 @@ under the License. - + createUser @@ -909,7 +909,7 @@ under the License. - + createDomain @@ -928,7 +928,7 @@ under the License. - + createDomain 64 @@ -940,9 +940,9 @@ under the License. - - + + deleteDomain @@ -952,7 +952,7 @@ under the License. - + listDomains 65 @@ -964,8 +964,8 @@ under the License. - - + + +--> deleteDomain 66 @@ -1032,7 +1032,7 @@ under the License. - + listDomains @@ -1045,8 +1045,8 @@ under the License. - - + + createUser @@ -1094,7 +1094,7 @@ under the License. - + deployVirtualMachine @@ -1109,7 +1109,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -1136,7 +1136,7 @@ under the License. - + deleteUser @@ -1146,7 +1146,7 @@ under the License. - + listEvents 601 @@ -1157,7 +1157,7 @@ under the License. - + @@ -1206,7 +1206,7 @@ under the License. - + registerUserKeys @@ -1225,8 +1225,8 @@ under the License. secretkey - - + + listVirtualMachines true @@ -1239,8 +1239,8 @@ under the License. - - + + deleteDomain @@ -1254,8 +1254,8 @@ under the License. true - - + + +--> deleteAccount id - accountid - - - - - - deleteAccount - - - id - accountid1 + accountid - + + + deleteAccount + + + id + accountid1 + + + + diff --git a/test/metadata/func/vmapi.xml b/test/metadata/func/vmapi.xml index 8c1263c7767..fbda66fe5d7 100644 --- a/test/metadata/func/vmapi.xml +++ b/test/metadata/func/vmapi.xml @@ -16,11 +16,11 @@ KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. --> - + - @@ -80,7 +80,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -121,7 +121,7 @@ under the License. - + destroyVirtualMachine [Destroy Virtual Machine] @@ -132,7 +132,7 @@ under the License. - + listVirtualMachines 72 [List the Destroyed Virutal Machine] @@ -147,7 +147,7 @@ under the License. - + startVirtualMachine @@ -160,7 +160,7 @@ under the License. - + listVirtualMachines @@ -176,8 +176,8 @@ under the License. - - + + createAccount @@ -223,7 +223,7 @@ under the License. name accountname - + @@ -237,7 +237,7 @@ under the License. accountname - + id @@ -251,7 +251,7 @@ under the License. - +--> createNetwork @@ -328,7 +328,7 @@ under the License. - + deployVirtualMachine [Deploy Virtual Machine in the new Account] @@ -344,7 +344,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -385,7 +385,7 @@ under the License. - + deleteUser [Delete User] @@ -395,7 +395,7 @@ under the License. userid - + deleteAccount @@ -406,8 +406,8 @@ under the License. accountid - - + + listVirtualMachines 74 [Check that no VMs present under the Account(List VM for a Removed User exercise END)] @@ -423,7 +423,7 @@ under the License. - + updateVirtualMachine @@ -439,8 +439,8 @@ under the License. true - - + + updateVirtualMachine @@ -456,10 +456,10 @@ under the License. true - - + - + + recoverVirtualMachine [Recover the Destroyed VM] @@ -470,7 +470,7 @@ under the License. - + resetPasswordForVirtualMachine 79-1 [Verify that one can reset password for VM in stopped state] @@ -482,7 +482,7 @@ under the License. - + updateVirtualMachine @@ -497,10 +497,10 @@ under the License. true - + - + startVirtualMachine [Start Virtual Machine (reset password for VM in running state exercise BEGIN)] @@ -511,7 +511,7 @@ under the License. - + resetPasswordForVirtualMachine 79-2 [Verify that one can reset password for VM in running state] @@ -522,7 +522,7 @@ under the License. - + @@ -538,9 +538,9 @@ under the License. false - - - + + + destroyVirtualMachine @@ -552,7 +552,7 @@ under the License. - + resetPasswordForVirtualMachine 80 [Verify that one can't reset password for VM in destroyed state] @@ -564,8 +564,8 @@ under the License. - - + + rebootVirtualMachine 89 [Verify that one can't reboot destroyed VM] @@ -578,7 +578,7 @@ under the License. - + deployVirtualMachine @@ -595,7 +595,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -636,7 +636,7 @@ under the License. - + resetPasswordForVirtualMachine 81 [Check whether password can be reset on virtual machine made from password disabled VM] @@ -648,7 +648,7 @@ under the License. - + changeServiceForVirtualMachine @@ -677,7 +677,7 @@ under the License. - + changeServiceForVirtualMachine 83 [Try to change service offering to the one that VM already has -ve case] @@ -693,8 +693,8 @@ under the License. - - + + rebootVirtualMachine @@ -707,7 +707,7 @@ under the License. - + @@ -721,7 +721,7 @@ under the License. - + startVirtualMachine [Start virtual machine] @@ -732,7 +732,7 @@ under the License. - + recoverVirtualMachine 813 [Try to recover running virtual machine] @@ -763,7 +763,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -789,8 +789,8 @@ under the License. globalnetworkid - - + + deployVirtualMachine @@ -808,7 +808,7 @@ under the License. diskofferingid globaldiskofferingid - + templateid globaltemplateid @@ -834,8 +834,8 @@ under the License. networkid - - + + destroyVirtualMachine @@ -848,7 +848,7 @@ under the License. - + rebootVirtualMachine @@ -861,7 +861,7 @@ under the License. - + startVirtualMachine @@ -886,6 +886,6 @@ under the License. - - - + + + diff --git a/test/metadata/func/vmsync.xml b/test/metadata/func/vmsync.xml index 0e7a69749f9..c0b34c9c37a 100644 --- a/test/metadata/func/vmsync.xml +++ b/test/metadata/func/vmsync.xml @@ -23,12 +23,12 @@ under the License. deployVirtualMachine deploy HA enabled VM test case - + diskofferingid globaldiskofferingid - + serviceofferingid globalserviceofferingid @@ -40,7 +40,7 @@ under the License. zoneid globalzoneid - + displayname HAenabledVM @@ -60,7 +60,7 @@ under the License. networkids globalnetworkid - + @@ -82,12 +82,12 @@ under the License. deployVirtualMachine deploy HA disabled VM test case - + diskofferingid globaldiskofferingid - + serviceofferingid globalserviceofferingid @@ -99,7 +99,7 @@ under the License. zoneid globalzoneid - + displayname HAdisabledVM @@ -119,7 +119,7 @@ under the License. networkids globalnetworkid - + @@ -174,7 +174,7 @@ under the License. haenable false - + @@ -196,7 +196,7 @@ under the License. - + @@ -233,8 +233,8 @@ under the License. instance_name_db - - + + select instance_name from vm_instance true @@ -251,7 +251,7 @@ under the License. instance_name_en - + @@ -259,13 +259,13 @@ under the License. killvm.sh Kill the HA enabled VM - + n instance_name_en - + h ipaddress_en @@ -278,13 +278,13 @@ under the License. killvm.sh Kill the HA disabled VM - + n instance_name_db - + h ipaddress_db @@ -303,7 +303,7 @@ under the License. 300 - + @@ -321,10 +321,10 @@ under the License. state Stopped - + - - + + listVirtualMachines List virtual machine with ha enabled @@ -393,7 +393,7 @@ under the License. - + destroyVirtualMachine Destroy ha enabled vm as a part of cleanup diff --git a/tools/checkstyle/src/main/resources/cloud-pmd.xml b/tools/checkstyle/src/main/resources/cloud-pmd.xml index ec2914f68f4..66a4ec08294 100644 --- a/tools/checkstyle/src/main/resources/cloud-pmd.xml +++ b/tools/checkstyle/src/main/resources/cloud-pmd.xml @@ -24,13 +24,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd" xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd"> - + Ruleset that brings all the rulesets we want from the pmd jar, because the maven-pmd-plugin doesn't find them otherwise. This is also the place to add our own future rulesets, if any. - + diff --git a/tools/checkstyle/src/main/resources/cloud-style.xml b/tools/checkstyle/src/main/resources/cloud-style.xml index ae68a7a5f08..0c111747eaf 100644 --- a/tools/checkstyle/src/main/resources/cloud-style.xml +++ b/tools/checkstyle/src/main/resources/cloud-style.xml @@ -1,12 +1,12 @@ - - Please note: our license is an adaptation of the MIT X11 License and should be @@ -917,7 +917,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - Permission is hereby granted, free of charge, to any person obtaining a copy of @@ -939,9 +939,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - Eclipse Distribution License Version 1.0 @@ -973,7 +973,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - Permission is hereby granted, free of charge, to any person obtaining @@ -1066,7 +1066,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 3. Neither the name of the copyright holders nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE @@ -1080,7 +1080,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. THE POSSIBILITY OF SUCH DAMAGE. -