Skip to content

Commit 3bbbda8

Browse files
author
Sheng Yang
committed
CLOUDSTACK-6047: Introduce VR resource unit test
1 parent 711b308 commit 3bbbda8

2 files changed

Lines changed: 788 additions & 3 deletions

File tree

core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ public Answer executeRequest(final NetworkElementCommand cmd) {
133133
return new Answer(cmd, false, rc.getDetails());
134134
}
135135

136+
assert cmd.getRouterAccessIp() != null : "Why there is no access IP for VR?";
137+
136138
if (cmd.isQuery()) {
137139
return executeQueryCommand(cmd);
138140
}
@@ -421,7 +423,7 @@ private List<ConfigItem> generateConfig(SetPortForwardingRulesCommand cmd) {
421423

422424
for (PortForwardingRuleTO rule : cmd.getRules()) {
423425
StringBuilder args = new StringBuilder();
424-
args.append(rule.revoked() ? " -D " : " -A ");
426+
args.append(rule.revoked() ? "-D" : "-A");
425427
args.append(" -P ").append(rule.getProtocol().toLowerCase());
426428
args.append(" -l ").append(rule.getSrcIp());
427429
args.append(" -p ").append(rule.getStringSrcPortRange());
@@ -812,7 +814,7 @@ protected List<ConfigItem> generateConfig(SetSourceNatCommand cmd) {
812814

813815
IpAddressTO pubIP = cmd.getIpAddress();
814816
String dev = "eth" + pubIP.getNicDevId();
815-
String args = " -A ";
817+
String args = "-A";
816818
args += " -l ";
817819
args += pubIP.getPublicIp();
818820
args += " -c ";
@@ -826,7 +828,7 @@ protected List<ConfigItem> generateConfig(SetPortForwardingRulesVpcCommand cmd)
826828
LinkedList<ConfigItem> cfg = new LinkedList<>();
827829

828830
for (PortForwardingRuleTO rule : cmd.getRules()) {
829-
String args = rule.revoked() ? " -D" : " -A";
831+
String args = rule.revoked() ? "-D" : "-A";
830832
args += " -P " + rule.getProtocol().toLowerCase();
831833
args += " -l " + rule.getSrcIp();
832834
args += " -p " + rule.getStringSrcPortRange();

0 commit comments

Comments
 (0)