Skip to content

Commit 02adbd4

Browse files
author
Naredula Janardhana Reddy
committed
bug 10617: merging code from branch bug10617
1 parent a2499c9 commit 02adbd4

43 files changed

Lines changed: 932 additions & 1244 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎agent/src/com/cloud/agent/resource/computing/FakeComputingResource.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@
6363
import com.cloud.agent.api.ReadyCommand;
6464
import com.cloud.agent.api.RebootAnswer;
6565
import com.cloud.agent.api.RebootCommand;
66-
import com.cloud.agent.api.SecurityIngressRuleAnswer;
67-
import com.cloud.agent.api.SecurityIngressRulesCmd;
66+
import com.cloud.agent.api.SecurityGroupRuleAnswer;
67+
import com.cloud.agent.api.SecurityGroupRulesCmd;
6868
import com.cloud.agent.api.StartAnswer;
6969
import com.cloud.agent.api.StartCommand;
7070
import com.cloud.agent.api.StartupCommand;
@@ -234,8 +234,8 @@ public Answer executeRequest(Command cmd) {
234234
return execute((GetStorageStatsCommand) cmd);
235235
} else if (cmd instanceof ModifyStoragePoolCommand) {
236236
return execute((ModifyStoragePoolCommand) cmd);
237-
} else if (cmd instanceof SecurityIngressRulesCmd) {
238-
return execute((SecurityIngressRulesCmd) cmd);
237+
} else if (cmd instanceof SecurityGroupRulesCmd) {
238+
return execute((SecurityGroupRulesCmd) cmd);
239239
} else if (cmd instanceof StartCommand ) {
240240
return execute((StartCommand) cmd);
241241
} else if (cmd instanceof CleanupNetworkRulesCmd) {
@@ -257,9 +257,9 @@ private Answer execute(CleanupNetworkRulesCmd cmd) {
257257
return new Answer(cmd);
258258
}
259259

260-
private Answer execute(SecurityIngressRulesCmd cmd) {
260+
private Answer execute(SecurityGroupRulesCmd cmd) {
261261
s_logger.info("Programmed network rules for vm " + cmd.getVmName() + " guestIp=" + cmd.getGuestIp() + ", numrules=" + cmd.getRuleSet().length);
262-
return new SecurityIngressRuleAnswer(cmd);
262+
return new SecurityGroupRuleAnswer(cmd);
263263
}
264264

265265
private Answer execute(ModifyStoragePoolCommand cmd) {

‎agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -120,8 +120,8 @@
120120
import com.cloud.agent.api.RebootAnswer;
121121
import com.cloud.agent.api.RebootCommand;
122122
import com.cloud.agent.api.RebootRouterCommand;
123-
import com.cloud.agent.api.SecurityIngressRuleAnswer;
124-
import com.cloud.agent.api.SecurityIngressRulesCmd;
123+
import com.cloud.agent.api.SecurityGroupRuleAnswer;
124+
import com.cloud.agent.api.SecurityGroupRulesCmd;
125125
import com.cloud.agent.api.StartAnswer;
126126
import com.cloud.agent.api.StartCommand;
127127
import com.cloud.agent.api.StartupCommand;
@@ -913,8 +913,8 @@ public Answer executeRequest(Command cmd) {
913913
return execute((CreateStoragePoolCommand) cmd);
914914
} else if (cmd instanceof ModifyStoragePoolCommand) {
915915
return execute((ModifyStoragePoolCommand) cmd);
916-
} else if (cmd instanceof SecurityIngressRulesCmd) {
917-
return execute((SecurityIngressRulesCmd) cmd);
916+
} else if (cmd instanceof SecurityGroupRulesCmd) {
917+
return execute((SecurityGroupRulesCmd) cmd);
918918
} else if (cmd instanceof DeleteStoragePoolCommand) {
919919
return execute((DeleteStoragePoolCommand) cmd);
920920
} else if (cmd instanceof FenceCommand ) {
@@ -1568,7 +1568,7 @@ protected Answer execute(ModifyStoragePoolCommand cmd) {
15681568
return answer;
15691569
}
15701570

1571-
private Answer execute(SecurityIngressRulesCmd cmd) {
1571+
private Answer execute(SecurityGroupRulesCmd cmd) {
15721572
String vif = null;
15731573
String brname = null;
15741574
try {
@@ -1577,10 +1577,10 @@ private Answer execute(SecurityIngressRulesCmd cmd) {
15771577
vif = nics.get(0).getDevName();
15781578
brname = nics.get(0).getBrName();
15791579
} catch (LibvirtException e) {
1580-
return new SecurityIngressRuleAnswer(cmd, false, e.toString());
1580+
return new SecurityGroupRuleAnswer(cmd, false, e.toString());
15811581
}
15821582

1583-
boolean result = add_network_rules(cmd.getVmName(),
1583+
boolean result = add_network_rules(cmd.getRuleType(), cmd.getVmName(),
15841584
Long.toString(cmd.getVmId()),
15851585
cmd.getGuestIp(),cmd.getSignature(),
15861586
Long.toString(cmd.getSeqNum()),
@@ -1589,10 +1589,10 @@ private Answer execute(SecurityIngressRulesCmd cmd) {
15891589

15901590
if (!result) {
15911591
s_logger.warn("Failed to program network rules for vm " + cmd.getVmName());
1592-
return new SecurityIngressRuleAnswer(cmd, false, "programming network rules failed");
1592+
return new SecurityGroupRuleAnswer(cmd, false, "programming network rules failed");
15931593
} else {
15941594
s_logger.debug("Programmed network rules for vm " + cmd.getVmName() + " guestIp=" + cmd.getGuestIp() + ", numrules=" + cmd.getRuleSet().length);
1595-
return new SecurityIngressRuleAnswer(cmd);
1595+
return new SecurityGroupRuleAnswer(cmd);
15961596
}
15971597
}
15981598

@@ -3540,7 +3540,7 @@ protected boolean default_network_rules_for_systemvm(Connect conn, String vmName
35403540
return true;
35413541
}
35423542

3543-
private boolean add_network_rules(String vmName, String vmId, String guestIP, String sig, String seq, String mac, String rules, String vif, String brname) {
3543+
private boolean add_network_rules(String ruleType, String vmName, String vmId, String guestIP, String sig, String seq, String mac, String rules, String vif, String brname) {
35443544
if (!_can_bridge_firewall) {
35453545
return false;
35463546
}
@@ -3551,6 +3551,7 @@ private boolean add_network_rules(String vmName, String vmId, String guestIP, St
35513551
cmd.add("--vmname", vmName);
35523552
cmd.add("--vmid", vmId);
35533553
cmd.add("--vmip", guestIP);
3554+
cmd.add("--ruletype", ruleType);
35543555
cmd.add("--sig", sig);
35553556
cmd.add("--seq", seq);
35563557
cmd.add("--vmmac", mac);

‎api/src/com/cloud/agent/api/SecurityEgressRuleAnswer.java‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎api/src/com/cloud/agent/api/SecurityEgressRulesCmd.java‎

Lines changed: 0 additions & 144 deletions
This file was deleted.

api/src/com/cloud/agent/api/SecurityIngressRuleAnswer.java renamed to api/src/com/cloud/agent/api/SecurityGroupRuleAnswer.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818
package com.cloud.agent.api;
1919

20-
public class SecurityIngressRuleAnswer extends Answer {
20+
public class SecurityGroupRuleAnswer extends Answer {
2121
public static enum FailureReason {
2222
NONE,
2323
UNKNOWN,
@@ -29,23 +29,23 @@ public static enum FailureReason {
2929
FailureReason reason = FailureReason.NONE;
3030

3131

32-
protected SecurityIngressRuleAnswer() {
32+
protected SecurityGroupRuleAnswer() {
3333
}
3434

35-
public SecurityIngressRuleAnswer(SecurityIngressRulesCmd cmd) {
35+
public SecurityGroupRuleAnswer(SecurityGroupRulesCmd cmd) {
3636
super(cmd);
3737
this.logSequenceNumber = cmd.getSeqNum();
3838
this.vmId = cmd.getVmId();
3939
}
4040

41-
public SecurityIngressRuleAnswer(SecurityIngressRulesCmd cmd, boolean result, String detail) {
41+
public SecurityGroupRuleAnswer(SecurityGroupRulesCmd cmd, boolean result, String detail) {
4242
super(cmd, result, detail);
4343
this.logSequenceNumber = cmd.getSeqNum();
4444
this.vmId = cmd.getVmId();
4545
reason = FailureReason.PROGRAMMING_FAILED;
4646
}
4747

48-
public SecurityIngressRuleAnswer(SecurityIngressRulesCmd cmd, boolean result, String detail, FailureReason r) {
48+
public SecurityGroupRuleAnswer(SecurityGroupRulesCmd cmd, boolean result, String detail, FailureReason r) {
4949
super(cmd, result, detail);
5050
this.logSequenceNumber = cmd.getSeqNum();
5151
this.vmId = cmd.getVmId();

0 commit comments

Comments
 (0)