diff --git a/api/src/com/cloud/agent/api/SecurityIngressRulesCmd.java b/api/src/com/cloud/agent/api/SecurityIngressRulesCmd.java index 97adc3aa74a..0dfd81a2436 100644 --- a/api/src/com/cloud/agent/api/SecurityIngressRulesCmd.java +++ b/api/src/com/cloud/agent/api/SecurityIngressRulesCmd.java @@ -70,6 +70,7 @@ public class SecurityIngressRulesCmd extends Command { String signature; Long seqNum; Long vmId; + Long msId; IpPortAndProto [] ruleSet; public SecurityIngressRulesCmd() { @@ -158,5 +159,13 @@ public class SecurityIngressRulesCmd extends Command { } return count; } + + public void setMsId(long msId) { + this.msId = msId; + } + + public Long getMsId() { + return msId; + } } diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java index 19aca5bd8e6..549cf581641 100755 --- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java +++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl.java @@ -148,7 +148,7 @@ public class SecurityGroupManagerImpl implements SecurityGroupManager, SecurityG ScheduledExecutorService _executorPool; ScheduledExecutorService _cleanupExecutor; - private long _serverId; + protected long _serverId; private int _timeBetweenCleanups = TIME_BETWEEN_CLEANUPS; // seconds protected int _numWorkerThreads = WORKER_THREAD_COUNT; diff --git a/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java b/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java index 9013fb01118..b513fc0a835 100644 --- a/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java +++ b/server/src/com/cloud/network/security/SecurityGroupManagerImpl2.java @@ -162,6 +162,7 @@ public class SecurityGroupManagerImpl2 extends SecurityGroupManagerImpl{ SecurityIngressRulesCmd cmd = generateRulesetCmd(vm.getInstanceName(), vm.getPrivateIpAddress(), vm.getPrivateMacAddress(), vm.getId(), null, work.getLogsequenceNumber(), rules); + cmd.setMsId(_serverId); if (s_logger.isTraceEnabled()) { s_logger.trace("SecurityGroupManager v2: sending ruleset update for vm " + vm.getInstanceName() + ": num rules=" + cmd.getRuleSet().length + " num cidrs=" + cmd.getTotalNumCidrs() + " sig=" + cmd.getSignature());