Revert "S-279280"

This reverts commit d9b49cc.

Author: ykohata

services/cloud_vm_service/src/java/main/com/topcoder/direct/cloudvm/service/bean/CloudVMServiceBean.java

@@ -116,21 +116,6 @@ public class CloudVMServiceBean implements CloudVMServiceRemote, CloudVMServiceL
 	 */
 	private static final String EMAIL = "email";
 
-	/**
-	 *	Represents the UserData key for storing challenge id
-	 */
-	private static final String CHALLENGE_ID = "challenge_id";
-
-	/**
-	 *	Represents the UserData key for storing challenge id
-	 */
-	private static final String CHALLENGE_NAME = "challenge_name";
-
-	/**
-	 *	Represents the UserData key for storing challenge id
-	 */
-	private static final String ROLE = "role";
-
 	/**
 	 * Represents the String containing the End of Line
 	 */
@@ -334,10 +319,6 @@ public List<VMInstanceData> launchVMInstance(TCSubject tcSubject, VMInstance vmI
 				userData.append(populateUserData(BRANCH,vmInstance.getSvnBranch()));
 				userData.append(populateUserData(HANDLE,tcMemberHandle));
 				userData.append(populateUserData(USER_EMAIL,userService.getEmailAddress(tcMemberHandle)));
-				userData.append(populateUserData(CHALLENGE_ID,String.valueOf(vmInstanceMain.getContestId())));
-				userData.append(populateUserData(CHALLENGE_NAME, vmInstanceMain.getContestName()));
-				userData.append(populateUserData(ROLE, vmInstanceMain.getUsageName()));
-
 				if (vmInstanceMain.getUserData() != null ){
 					userData.append(vmInstanceMain.getUserData());
 				}

services/cloud_vm_service/src/java/main/com/topcoder/direct/services/view/dto/cloudvm/VMInstance.java

@@ -67,11 +67,6 @@ public class VMInstance extends AbstractIdEntity {
      * Represents the usage id. It has getter & setter. It can be any value.
      */
     private long usageId;
-
-    /**
-     * Represents the usage id. It has getter & setter. It can be any value.
-     */
-    private String usageName;
 
     /**
      * Represents VM public IP address.
@@ -328,27 +323,6 @@ public void setPublicIP(String publicIP) {
         this.publicIP = publicIP;
     }
 
-    /**
-     * Setter for the namesake instance variable. Simply set the value to the namesake instance variable.
-     *
-     * @param usageName
-     */
-    public void setUsageName(String usageName) {
-        this.usageName = usageName;
-    }
-
-    /**
-     * Getter for the namesake instance variable. Simply return the namesake instance variable.
-     *
-     * @return field value
-     * @since BUGR-3932
-     */
-    public String getUsageName() {
-        return usageName;
-    }
-
-    
-
     /**
      * Getter for the namesake instance variable. Simply return the namesake instance variable.
      *

services/cloud_vm_service/src/java/main/com/topcoder/direct/services/view/dto/cloudvm/VMUsage.java

@@ -45,26 +45,5 @@ public String getName() {
     public void setName(String name) {
         this.name = name;
     }
-
-
-    public static String getName(long id) {
-        if (id == 1) {
-            return "VM for competitors";
-        }
-
-        if (id == 2) {
-            return "VM for reviewers";
-        }
-
-        if (id == 3) {
-            return "VM for manager/copilots";
-        }
-
-        if (id == 4) {
-            return "VM for Bug race";
-        }
-
-        return "VM for competitors";
-    }
 }
 

src/java/main/com/topcoder/direct/services/view/action/cloudvm/LaunchVMInstanceAction.java

@@ -7,17 +7,13 @@
 import com.topcoder.direct.services.view.action.contest.launch.ValidationErrorRecord;
 import com.topcoder.direct.services.view.action.contest.launch.ValidationErrors;
 import com.topcoder.direct.services.view.dto.cloudvm.VMInstance;
-import com.topcoder.direct.services.view.dto.cloudvm.VMUsage;
 import com.topcoder.direct.services.view.util.DirectUtils;
-import com.topcoder.management.project.ProjectPropertyType;
 import com.topcoder.service.facade.contest.ContestServiceFacade;
-import com.topcoder.service.project.SoftwareCompetition;
 import com.topcoder.service.user.UserService;
 import com.topcoder.service.user.UserServiceException;
 import com.topcoder.security.TCSubject;
 import com.topcoder.shared.security.AuthorizationException;
 
-
 import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;
@@ -109,18 +105,6 @@ protected void executeAction() throws Exception {
                 errors.put("contestId",
                     "No contest with such id. Contest type may be wrong or you may have no permission to access contest data.");
             }
-
-            String challengeName = "Bug Race";
-            if (instance.getContestTypeId() != bugRaceContestTypeId) {
-                challengeName = ((SoftwareCompetition) result).getProjectHeader().getProperty(
-                        ProjectPropertyType.PROJECT_NAME_PROJECT_PROPERTY_KEY);
-
-            }
-
-            instance.setContestName(challengeName);
-
-            instance.setUsageName(VMUsage.getName(instance.getUsageId()));
-
         }
 
         // check member handle