apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

api_refactor: refactor security group (sg) apis

Browse Source 
- Fix refactored apis, fix mapping in commands*.in
- Fix comments etc.

Signed-off-by: Rohit Yadav <bhaisaab@apache.org>
This commit is contained in:
Rohit Yadav 2012-12-03 23:11:17 -08:00
parent 3e0b2164be
commit 0df9538fb7
10 changed files with 24 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
api/src/com/cloud/network/security/SecurityGroupService.java
View File

@ -18,13 +18,10 @@ package com.cloud.network.security;
import java.util.List;
import com.cloud.api.commands.AuthorizeSecurityGroupEgressCmd;
import com.cloud.api.commands.AuthorizeSecurityGroupIngressCmd;
import com.cloud.api.commands.CreateSecurityGroupCmd;
import com.cloud.api.commands.DeleteSecurityGroupCmd;
import com.cloud.api.commands.ListSecurityGroupsCmd;
import com.cloud.api.commands.RevokeSecurityGroupEgressCmd;
import com.cloud.api.commands.RevokeSecurityGroupIngressCmd;
import org.apache.cloudstack.api.user.sg.command.*;
import org.apache.cloudstack.api.user.sg.command.AuthorizeSecurityGroupIngressCmd;
import org.apache.cloudstack.api.user.sg.command.CreateSecurityGroupCmd;
import org.apache.cloudstack.api.user.sg.command.RevokeSecurityGroupEgressCmd;
import com.cloud.exception.InvalidParameterValueException;
import com.cloud.exception.PermissionDeniedException;
import com.cloud.exception.ResourceInUseException;

2
api/src/com/cloud/api/commands/AuthorizeSecurityGroupEgressCmd.java → api/src/org/apache/cloudstack/api/user/sg/command/AuthorizeSecurityGroupEgressCmd.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.api.commands;
package org.apache.cloudstack.api.user.sg.command;
import java.util.Collection;
import java.util.HashMap;

2
api/src/com/cloud/api/commands/AuthorizeSecurityGroupIngressCmd.java → api/src/org/apache/cloudstack/api/user/sg/command/AuthorizeSecurityGroupIngressCmd.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.api.commands;
package org.apache.cloudstack.api.user.sg.command;
import java.util.Collection;
import java.util.HashMap;

2
api/src/com/cloud/api/commands/CreateSecurityGroupCmd.java → api/src/org/apache/cloudstack/api/user/sg/command/CreateSecurityGroupCmd.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.api.commands;
package org.apache.cloudstack.api.user.sg.command;
import org.apache.log4j.Logger;

2
api/src/com/cloud/api/commands/DeleteSecurityGroupCmd.java → api/src/org/apache/cloudstack/api/user/sg/command/DeleteSecurityGroupCmd.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.api.commands;
package org.apache.cloudstack.api.user.sg.command;
import org.apache.log4j.Logger;

2
api/src/com/cloud/api/commands/ListSecurityGroupsCmd.java → api/src/org/apache/cloudstack/api/user/sg/command/ListSecurityGroupsCmd.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.api.commands;
package org.apache.cloudstack.api.user.sg.command;
import java.util.List;

2
api/src/com/cloud/api/commands/RevokeSecurityGroupEgressCmd.java → api/src/org/apache/cloudstack/api/user/sg/command/RevokeSecurityGroupEgressCmd.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.api.commands;
package org.apache.cloudstack.api.user.sg.command;
import org.apache.log4j.Logger;

2
api/src/com/cloud/api/commands/RevokeSecurityGroupIngressCmd.java → api/src/org/apache/cloudstack/api/user/sg/command/RevokeSecurityGroupIngressCmd.java
View File

@ -14,7 +14,7 @@
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.
package com.cloud.api.commands;
package org.apache.cloudstack.api.user.sg.command;
import org.apache.log4j.Logger;

14
client/tomcatconf/commands.properties.in
View File

@ -273,13 +273,13 @@ enableStorageMaintenance=com.cloud.api.commands.PreparePrimaryStorageForMaintena
cancelStorageMaintenance=com.cloud.api.commands.CancelPrimaryStorageMaintenanceCmd;1
#### security group commands
createSecurityGroup=com.cloud.api.commands.CreateSecurityGroupCmd;15
deleteSecurityGroup=com.cloud.api.commands.DeleteSecurityGroupCmd;15
authorizeSecurityGroupIngress=com.cloud.api.commands.AuthorizeSecurityGroupIngressCmd;15
revokeSecurityGroupIngress=com.cloud.api.commands.RevokeSecurityGroupIngressCmd;15
authorizeSecurityGroupEgress=com.cloud.api.commands.AuthorizeSecurityGroupEgressCmd;15
revokeSecurityGroupEgress=com.cloud.api.commands.RevokeSecurityGroupEgressCmd;15
listSecurityGroups=com.cloud.api.commands.ListSecurityGroupsCmd;15
createSecurityGroup=org.apache.cloudstack.api.user.sg.command.CreateSecurityGroupCmd;15
deleteSecurityGroup=org.apache.cloudstack.api.user.sg.command.DeleteSecurityGroupCmd;15
authorizeSecurityGroupIngress=org.apache.cloudstack.api.user.sg.command.AuthorizeSecurityGroupIngressCmd;15
revokeSecurityGroupIngress=org.apache.cloudstack.api.user.sg.command.RevokeSecurityGroupIngressCmd;15
authorizeSecurityGroupEgress=org.apache.cloudstack.api.user.sg.command.AuthorizeSecurityGroupEgressCmd;15
revokeSecurityGroupEgress=org.apache.cloudstack.api.user.sg.command.RevokeSecurityGroupEgressCmd;15
listSecurityGroups=org.apache.cloudstack.api.user.sg.command.ListSecurityGroupsCmd;15
#### vm group commands
createInstanceGroup=com.cloud.api.commands.CreateVMGroupCmd;15

13
server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
View File

@ -36,6 +36,7 @@ import java.util.concurrent.TimeUnit;
import javax.ejb.Local;
import javax.naming.ConfigurationException;
import org.apache.cloudstack.api.user.sg.command.*;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.log4j.Logger;
@ -44,13 +45,11 @@ import com.cloud.agent.api.NetworkRulesSystemVmCommand;
import com.cloud.agent.api.SecurityGroupRulesCmd;
import com.cloud.agent.api.SecurityGroupRulesCmd.IpPortAndProto;
import com.cloud.agent.manager.Commands;
import com.cloud.api.commands.AuthorizeSecurityGroupEgressCmd;
import com.cloud.api.commands.AuthorizeSecurityGroupIngressCmd;
import com.cloud.api.commands.CreateSecurityGroupCmd;
import com.cloud.api.commands.DeleteSecurityGroupCmd;
import com.cloud.api.commands.ListSecurityGroupsCmd;
import com.cloud.api.commands.RevokeSecurityGroupEgressCmd;
import com.cloud.api.commands.RevokeSecurityGroupIngressCmd;
import org.apache.cloudstack.api.user.sg.command.AuthorizeSecurityGroupEgressCmd;
import org.apache.cloudstack.api.user.sg.command.CreateSecurityGroupCmd;
import org.apache.cloudstack.api.user.sg.command.DeleteSecurityGroupCmd;
import org.apache.cloudstack.api.user.sg.command.ListSecurityGroupsCmd;
import org.apache.cloudstack.api.user.sg.command.RevokeSecurityGroupEgressCmd;
import com.cloud.configuration.Config;
import com.cloud.configuration.dao.ConfigurationDao;
import com.cloud.domain.dao.DomainDao;