[rhq] Branch 'bundle' - 2 commits - modules/cli-tests

[mazz]

modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js |   11 ++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 4b3a38bde286be786c1a2bafc607376365293159
Merge: eb8c501... 6e01a49...
Author: John Mazzitelli 
Date:   Thu May 27 12:38:36 2010 -0400

Merge branch 'bundle' of ssh://git.fedorahosted.org/git/rhq/rhq into bundle

commit eb8c50193da8aea86329fbce45e63d07fe0abf4a
Author: John Mazzitelli 
Date:   Thu May 27 12:20:15 2010 -0400

fix to use the latest API

diff --git a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js
index fb19a06..15d0463 100644
--- a/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js
+++ b/modules/cli-tests/src/test/script/org/rhq/enterprise/remoting/cli/test_bundleManagerUpgrade.js
@@ -85,14 +85,17 @@ function testGroupDeployment() {
    var property23 = new PropertySimple("upgrade.test.new", "A NEW REPLACEMENT");
    config2.put( property23 );

+   // create a destination to deploy to
+   var testDest = BundleManager.createBundleDestination(testBundleVersion1.getBundle().getId(), "upgrade destination", "upgrade destination", "/tmp/upgrade-bundle-test", groupId);
+
    // create a deployment of 1.0 using the 1.0 config
-   var testDeployment = BundleManager.createBundleDeployment(testBundleVersion1.getId(), "Upgrade Deployment Test 1", "Creating initial deployment to be upgraded", "/tmp/upgrade-bundle-test", config1);
-   var bgd = BundleManager.scheduleBundleGroupDeployment(testDeployment.getId(), groupId);
+   var testDeployment = BundleManager.createBundleDeployment(testBundleVersion1.getId(), testDest.getId(), "Upgrade Deployment Test 1", "Creating initial deployment to be upgraded", config1);
+   var bgd = BundleManager.scheduleBundleDeployment(testDeployment.getId(), true);
    Assert.assertNotNull( bgd, "Failed to create 1.0 deployment" );

// upgrade the deployment to 2.0 using the 2.0 config
-   testDeployment = BundleManager.createBundleDeployment(testBundleVersion2.getId(), "Upgrade Deployment Test 2", "Testing upgrade deployment", "/tmp/upgrade-bundle-test", config2);
-   bgd = BundleManager.scheduleBundleGroupDeployment(testDeployment.getId(), groupId);
+   testDeployment = BundleManager.createBundleDeployment(testBundleVersion2.getId(), testDest.getId(), "Upgrade Deployment Test 2", "Testing upgrade deployment", config2);
+   bgd = BundleManager.scheduleBundleDeployment(testDeployment.getId(), false);
    Assert.assertNotNull( bgd, "Failed to upgrade to 2.0 deployment" );
 }