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

bug 6361: first part of incremental checkin to rename network group to security grou[

This commit is contained in:
abhishek 2010-10-19 14:13:25 -07:00
parent 2a56ce0baf
commit 6bd7caa9c2
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/api/commands/CreateNetworkGroupCmd.java → server/src/com/cloud/api/commands/CreateSecurityGroupCmd.java
View File

@ -28,8 +28,8 @@ import com.cloud.api.response.NetworkGroupResponse;
import com.cloud.network.security.NetworkGroupVO;
@Implementation(method="createNetworkGroup", manager=Manager.NetworkGroupManager)
public class CreateNetworkGroupCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateNetworkGroupCmd.class.getName());
public class CreateSecurityGroupCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateSecurityGroupCmd.class.getName());
private static final String s_name = "createnetworkgroupresponse";

4
server/src/com/cloud/network/security/NetworkGroupListener.java
View File

@ -44,12 +44,12 @@ import com.cloud.network.security.dao.NetworkGroupWorkDao;
public class NetworkGroupListener implements Listener {
public static final Logger s_logger = Logger.getLogger(NetworkGroupListener.class.getName());
NetworkGroupManagerImpl _networkGroupManager;
SecurityGroupManagerImpl _networkGroupManager;
AgentManager _agentMgr;
NetworkGroupWorkDao _workDao;
public NetworkGroupListener(NetworkGroupManagerImpl networkGroupManager,
public NetworkGroupListener(SecurityGroupManagerImpl networkGroupManager,
AgentManager agentMgr, NetworkGroupWorkDao workDao) {
super();
_networkGroupManager = networkGroupManager;

4
server/src/com/cloud/network/security/NetworkGroupManager.java
View File

@ -21,7 +21,7 @@ import java.util.HashMap;
import java.util.List;
import com.cloud.api.commands.AuthorizeNetworkGroupIngressCmd;
import com.cloud.api.commands.CreateNetworkGroupCmd;
import com.cloud.api.commands.CreateSecurityGroupCmd;
import com.cloud.api.commands.DeleteNetworkGroupCmd;
import com.cloud.api.commands.ListNetworkGroupsCmd;
import com.cloud.api.commands.RevokeNetworkGroupIngressCmd;
@ -53,7 +53,7 @@ public interface NetworkGroupManager extends Manager {
* @param command the command specifying the name and description
* @return the created network group if successful, null otherwise
*/
public NetworkGroupVO createNetworkGroup(CreateNetworkGroupCmd command) throws PermissionDeniedException, InvalidParameterValueException;
public NetworkGroupVO createNetworkGroup(CreateSecurityGroupCmd command) throws PermissionDeniedException, InvalidParameterValueException;
public NetworkGroupVO createDefaultNetworkGroup( Long accountId);

8
server/src/com/cloud/network/security/NetworkGroupManagerImpl.java → server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
View File

@ -46,7 +46,7 @@ import com.cloud.agent.manager.Commands;
import com.cloud.api.BaseCmd;
import com.cloud.api.ServerApiException;
import com.cloud.api.commands.AuthorizeNetworkGroupIngressCmd;
import com.cloud.api.commands.CreateNetworkGroupCmd;
import com.cloud.api.commands.CreateSecurityGroupCmd;
import com.cloud.api.commands.DeleteNetworkGroupCmd;
import com.cloud.api.commands.ListNetworkGroupsCmd;
import com.cloud.api.commands.RevokeNetworkGroupIngressCmd;
@ -87,8 +87,8 @@ import com.cloud.vm.UserVmVO;
import com.cloud.vm.dao.UserVmDao;
@Local(value={NetworkGroupManager.class})
public class NetworkGroupManagerImpl implements NetworkGroupManager {
public static final Logger s_logger = Logger.getLogger(NetworkGroupManagerImpl.class.getName());
public class SecurityGroupManagerImpl implements NetworkGroupManager {
public static final Logger s_logger = Logger.getLogger(SecurityGroupManagerImpl.class.getName());
@Inject NetworkGroupDao _networkGroupDao;
@Inject IngressRuleDao _ingressRuleDao;
@ -846,7 +846,7 @@ public class NetworkGroupManagerImpl implements NetworkGroupManager {
}
@Override
public NetworkGroupVO createNetworkGroup(CreateNetworkGroupCmd cmd) throws PermissionDeniedException, InvalidParameterValueException {
public NetworkGroupVO createNetworkGroup(CreateSecurityGroupCmd cmd) throws PermissionDeniedException, InvalidParameterValueException {
if (!_enabled) {
return null;
}