etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactored code

This commit is contained in:
abhishek 2010-10-14 14:14:12 -07:00
parent 83e737a237
commit bc4e750996
4 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/.classpath
View File

@ -5,6 +5,7 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/utils"/>
<classpathentry kind="lib" path="/thirdparty/xmlrpc-common-3.1.3.jar"/>
<classpathentry kind="lib" path="/thirdparty/manageontap.jar"/>
<classpathentry kind="lib" path="/thirdparty/xmlrpc-client-3.1.3.jar"/>
<classpathentry kind="lib" path="/thirdparty/gson-1.3.jar"/>
<classpathentry kind="lib" path="/thirdparty/log4j-1.2.15.jar"/>

9
core/src/com/cloud/server/ManagementServer.java
View File

@ -17,13 +17,20 @@
*/
package com.cloud.server;
import java.io.IOException;
import java.net.URISyntaxException;
import java.net.UnknownHostException;
import java.rmi.ServerException;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Map;
import netapp.manage.NaAPIFailedException;
import netapp.manage.NaAuthenticationException;
import netapp.manage.NaException;
import netapp.manage.NaProtocolException;
import com.cloud.alert.AlertVO;
import com.cloud.async.AsyncJobResult;
import com.cloud.async.AsyncJobVO;
@ -88,6 +95,7 @@ import com.cloud.user.UserAccount;
import com.cloud.user.UserAccountVO;
import com.cloud.user.UserStatisticsVO;
import com.cloud.utils.Pair;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.exception.ExecutionException;
import com.cloud.vm.ConsoleProxyVO;
import com.cloud.vm.DomainRouter;
@ -2169,4 +2177,5 @@ public interface ManagementServer {
public List<PreallocatedLunVO> getPreAllocatedLuns(Criteria c);
public String getNetworkGroupsNamesForVm(long vmId);
}

1
server/.classpath
View File

@ -11,6 +11,7 @@
<classpathentry kind="lib" path="/thirdparty/gson-1.3.jar"/>
<classpathentry kind="lib" path="/thirdparty/commons-httpclient-3.1.jar"/>
<classpathentry kind="lib" path="/thirdparty/httpcore-4.0.jar"/>
<classpathentry kind="lib" path="/thirdparty/manageontap.jar"/>
<classpathentry kind="lib" path="/thirdparty/email.jar"/>
<classpathentry kind="lib" path="/thirdparty/junit-4.8.1.jar"/>
<classpathentry kind="lib" path="/thirdparty/xenserver-5.5.0-1.jar"/>

9
server/src/com/cloud/server/ManagementServerImpl.java
View File

@ -17,6 +17,7 @@
*/
package com.cloud.server;
import java.io.IOException;
import java.math.BigInteger;
import java.net.Inet6Address;
import java.net.InetAddress;
@ -24,6 +25,7 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.net.URLEncoder;
import java.net.UnknownHostException;
import java.rmi.ServerException;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;
import java.text.DecimalFormat;
@ -49,6 +51,11 @@ import javax.crypto.Mac;
import javax.crypto.SecretKey;
import javax.crypto.spec.SecretKeySpec;
import netapp.manage.NaAPIFailedException;
import netapp.manage.NaAuthenticationException;
import netapp.manage.NaException;
import netapp.manage.NaProtocolException;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
@ -382,7 +389,6 @@ public class ManagementServerImpl implements ManagementServer {
_hostPodDao = locator.getDao(HostPodDao.class);
_jobDao = locator.getDao(AsyncJobDao.class);
_clusterDao = locator.getDao(ClusterDao.class);
_accountMgr = locator.getManager(AccountManager.class);
_agentMgr = locator.getManager(AgentManager.class);
_configMgr = locator.getManager(ConfigurationManager.class);
@ -8300,5 +8306,6 @@ public class ManagementServerImpl implements ManagementServer {
return _networkGroupMgr.getNetworkGroupsNamesForVm(vmId);
}
}