dev/null
|binary
modules/cli-tests/src/test/resources/cli-test-bundle-zip.zip
|binary
modules/cli-tests/src/test/resources/cli-test-bundle.zip
|binary
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManager.js
| 2
modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerZip.js
| 37 +++-------
5 files changed, 15 insertions(+), 24 deletions(-)
New commits:
commit 66a4b127bbfcdca8b2f1196af2bed4a22be12421
Merge: 27534d0... 2ec54df...
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Apr 30 16:20:33 2010 -0400
Merge branch 'gwt' into gwt-jay
commit 27534d07483c02820e8adca6bd9647b4635d5de3
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Fri Apr 30 16:09:42 2010 -0400
update bundle creation scripts to use distros
diff --git a/modules/cli-tests/src/test/resources/cli-test-bundle-zip.zip
b/modules/cli-tests/src/test/resources/cli-test-bundle-zip.zip
new file mode 100644
index 0000000..7e0e7b1
Binary files /dev/null and b/modules/cli-tests/src/test/resources/cli-test-bundle-zip.zip
differ
diff --git a/modules/cli-tests/src/test/resources/cli-test-bundle.zip
b/modules/cli-tests/src/test/resources/cli-test-bundle.zip
index 9c46339..9469e02 100644
Binary files a/modules/cli-tests/src/test/resources/cli-test-bundle.zip and
b/modules/cli-tests/src/test/resources/cli-test-bundle.zip differ
diff --git a/modules/cli-tests/src/test/resources/dummy.zip
b/modules/cli-tests/src/test/resources/dummy.zip
deleted file mode 100644
index 933fa1a..0000000
Binary files a/modules/cli-tests/src/test/resources/dummy.zip and /dev/null differ
diff --git
a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManager.js
b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManager.js
index 98832c5..42b8225 100644
---
a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManager.js
+++
b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManager.js
@@ -28,7 +28,7 @@
var TestsEnabled = true;
-var bundleName = 'testScriptBundle';
+var bundleName = 'test-cli-bundle';
// note, super-user, will not test any security constraints
var subject = rhq.login('rhqadmin', 'rhqadmin');
diff --git
a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerZip.js
b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerZip.js
index 1719659..a77983d 100644
---
a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerZip.js
+++
b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerZip.js
@@ -28,7 +28,7 @@
var TestsEnabled = true;
-var bundleName = 'testScriptBundleZip';
+var bundleName = 'test-cli-bundle-zip';
// note, super-user, will not test any security constraints
var subject = rhq.login('rhqadmin', 'rhqadmin');
@@ -37,7 +37,7 @@ executeAllTests();
rhq.logout();
-function testDeployment() {
+function testGroupDeployment() {
if ( !TestsEnabled ) {
return;
}
@@ -51,21 +51,10 @@ function testDeployment() {
BundleManager.deleteBundle( bundles.get(0).getId() );
}
- // create the test bundle
- var testBundle = BundleManager.createBundle( bundleName, getBundleType() );
-
- // define the recipe for bundleVersion 1.0
- var recipe = "deploy -f dummy.zip -d @@dummy.deployHome@(a)\n"
- + "realize -f @@dummy.deployHome@(a)/dummy/README.txt\n"
- + "realize -f @@dummy.deployHome@(a)/dummy/subdirectory/file.txt";
-
// create bundleVersion 1.0
- var testBundleVersion = BundleManager.createBundleVersion( testBundle.getId(),
bundleName, null, recipe);
-
- // add the single bundleFile, the test war file
- var fileBytes = scriptUtil.getFileBytes("./src/test/resources/dummy.zip");
- var bundleFile = BundleManager.addBundleFileViaByteArray(testBundleVersion.getId(),
"dummy.zip",
- "1.0", null, fileBytes);
+ var distributionFile = new
java.io.File("./src/test/resources/cli-test-bundle-zip.zip");
+ distributionFile = new java.io.File(distributionFile.getAbsolutePath());
+ var testBundleVersion = BundleManager.createBundleVersionViaFile( distributionFile );
// create the config, setting the required properties from the recipe
var config = new Configuration();
@@ -77,15 +66,17 @@ function testDeployment() {
config.put( property3 );
// create a deployment using the above config
- var testDeployment = BundleManager.createBundleDeployment(testBundleVersion.getId(),
"Deployment Test", "Deployment Test of dummy ZIP", config);
+ var testDeployment = BundleManager.createBundleDeployment(testBundleVersion.getId(),
"Deployment Test", "Deployment Test of dummy ZIP",
"/tmp/bundle-test", config);
- // Find a target platform
- var rc = new ResourceCriteria();
- rc.addFilterResourceTypeName("in"); // wINdows, lINux
- var winPlatforms = ResourceManager.findResourcesByCriteria(rc);
- var platformId = winPlatforms.get(0).getId();
+ // Find a target platform group
+ var rgc = new ResourceGroupCriteria();
+ rgc.addFilterName("platforms");
+ var groups = ResourceGroupManager.findResourceGroupsByCriteria(rgc);
+ Assert.assertTrue( groups.size() > 0 );
+ var groupId = groups.get(0).getId();
- var bundleScheduleResponse =
BundleManager.scheduleBundleResourceDeployment(testDeployment.getId(), platformId);
+ var bgd = BundleManager.scheduleBundleGroupDeployment(testDeployment.getId(),
groupId);
+ Assert.assertNotNull( bgd );
}
function getBundleType() {
Show replies by date