From e25fbe3a89f0618485bd1a1400389f60220c29d5 Mon Sep 17 00:00:00 2001
From: alena <alena@cloud.com>
Date: Wed, 9 Mar 2011 09:31:39 -0800
Subject: [PATCH] bug 8885: enableAccount - account/domainID are required
 parameters now status 8885: resolved fixed

---
 api/src/com/cloud/api/commands/EnableAccountCmd.java |  4 ++--
 ...st.java => InstanceGroup217To223UpgradeTest.java} | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)
 rename server/test/com/cloud/upgrade/dao/{InstanceGroup217To221UpgradeTest.java => InstanceGroup217To223UpgradeTest.java} (96%)

diff --git a/api/src/com/cloud/api/commands/EnableAccountCmd.java b/api/src/com/cloud/api/commands/EnableAccountCmd.java
index 11b9229497c..3dfdbebcf89 100644
--- a/api/src/com/cloud/api/commands/EnableAccountCmd.java
+++ b/api/src/com/cloud/api/commands/EnableAccountCmd.java
@@ -36,10 +36,10 @@ public class EnableAccountCmd extends BaseCmd {
     //////////////// API parameters /////////////////////
     /////////////////////////////////////////////////////
 
-    @Parameter(name=ApiConstants.ACCOUNT, type=CommandType.STRING, description="Enables specified account.")
+    @Parameter(name=ApiConstants.ACCOUNT, type=CommandType.STRING, required=true, description="Enables specified account.")
     private String accountName;
 
-    @Parameter(name=ApiConstants.DOMAIN_ID, type=CommandType.LONG, description="Enables specified account in this domain.")
+    @Parameter(name=ApiConstants.DOMAIN_ID, type=CommandType.LONG, required=true, description="Enables specified account in this domain.")
     private Long domainId;
 
     /////////////////////////////////////////////////////
diff --git a/server/test/com/cloud/upgrade/dao/InstanceGroup217To221UpgradeTest.java b/server/test/com/cloud/upgrade/dao/InstanceGroup217To223UpgradeTest.java
similarity index 96%
rename from server/test/com/cloud/upgrade/dao/InstanceGroup217To221UpgradeTest.java
rename to server/test/com/cloud/upgrade/dao/InstanceGroup217To223UpgradeTest.java
index 1047fcc1c78..58eba1ccbaa 100644
--- a/server/test/com/cloud/upgrade/dao/InstanceGroup217To221UpgradeTest.java
+++ b/server/test/com/cloud/upgrade/dao/InstanceGroup217To223UpgradeTest.java
@@ -38,8 +38,8 @@ import com.cloud.utils.db.DbTestUtils;
 import com.cloud.utils.db.Transaction;
 import com.cloud.utils.exception.CloudRuntimeException;
 
-public class InstanceGroup217To221UpgradeTest extends TestCase {
-    private static final Logger s_logger = Logger.getLogger(InstanceGroup217To221UpgradeTest.class);
+public class InstanceGroup217To223UpgradeTest extends TestCase {
+    private static final Logger s_logger = Logger.getLogger(InstanceGroup217To223UpgradeTest.class);
 
     @Override
     @Before
@@ -72,7 +72,7 @@ public class InstanceGroup217To221UpgradeTest extends TestCase {
         }
         
         try {
-            dao.upgrade("2.1.7", "2.2.1");
+            dao.upgrade("2.1.7", "2.2.3");
         } catch (ConfigurationException e) {
             s_logger.warn("Exception: ", e);
             assert false : "The test failed.  Check logs"; 
@@ -81,7 +81,7 @@ public class InstanceGroup217To221UpgradeTest extends TestCase {
         conn = Transaction.getStandaloneConnection();
         try {
             
-            s_logger.debug("Starting tesing upgrade from 2.1.7 to 2.2.2 for Instance groups...");
+            s_logger.debug("Starting tesing upgrade from 2.1.7 to 2.2.3 for Instance groups...");
             
             //Version check
             pstmt = conn.prepareStatement("SELECT version FROM version");
@@ -89,8 +89,8 @@ public class InstanceGroup217To221UpgradeTest extends TestCase {
             
             if (!rs.next()) {
                 s_logger.error("ERROR: No version selected");
-            } else if (!rs.getString(1).equals("2.2.1")) {
-                s_logger.error("ERROR: VERSION stored is not 2.2.1: " + rs.getString(1));
+            } else if (!rs.getString(1).equals("2.2.3")) {
+                s_logger.error("ERROR: VERSION stored is not 2.2.3: " + rs.getString(1));
             }
             rs.close();
             pstmt.close();