[cloudstack] branch 4.18 updated: security group: replace vm.getPrivateMacAddress() with nic.getMacAddress() (#7293)

[weizhou]

This is an automated email from the ASF dual-hosted git repository.

weizhou pushed a commit to branch 4.18
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/4.18 by this push:
     new add64bd7e69 security group: replace vm.getPrivateMacAddress() with 
nic.getMacAddress() (#7293)
add64bd7e69 is described below

commit add64bd7e69eca52f5a3e10748c247ea50afcc14
Author: Sina Kashipazha <sore...@users.noreply.github.com>
AuthorDate: Fri Aug 18 10:49:16 2023 +0200

    security group: replace vm.getPrivateMacAddress() with nic.getMacAddress() 
(#7293)
---
 .../main/java/com/cloud/network/security/SecurityGroupManagerImpl.java  | 2 +-
 .../main/java/com/cloud/network/security/SecurityGroupManagerImpl2.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java 
b/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java
index abbbd4965a4..b423ce78fa8 100644
--- 
a/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java
+++ 
b/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl.java
@@ -1071,7 +1071,7 @@ public class SecurityGroupManagerImpl extends ManagerBase 
implements SecurityGro
                             } else {
                                 return;
                             }
-                            SecurityGroupRulesCmd cmd = 
generateRulesetCmd(vm.getInstanceName(), nic.getIPv4Address(), 
nic.getIPv6Address(), vm.getPrivateMacAddress(), vm.getId(),
+                            SecurityGroupRulesCmd cmd = 
generateRulesetCmd(vm.getInstanceName(), nic.getIPv4Address(), 
nic.getIPv6Address(), nic.getMacAddress(), vm.getId(),
                                     generateRulesetSignature(ingressRules, 
egressRules), seqnum, ingressRules, egressRules, nicSecIps);
                             Commands cmds = new Commands(cmd);
                             try {
diff --git 
a/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl2.java
 
b/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl2.java
index eadcc5f1e7d..b75c39560cf 100644
--- 
a/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl2.java
+++ 
b/server/src/main/java/com/cloud/network/security/SecurityGroupManagerImpl2.java
@@ -188,7 +188,7 @@ public class SecurityGroupManagerImpl2 extends 
SecurityGroupManagerImpl {
                     return;
                 }
                 SecurityGroupRulesCmd cmd =
-                    generateRulesetCmd(vm.getInstanceName(), 
nic.getIPv4Address(), nic.getIPv6Address(), vm.getPrivateMacAddress(), 
vm.getId(), null, work.getLogsequenceNumber(),
+                    generateRulesetCmd(vm.getInstanceName(), 
nic.getIPv4Address(), nic.getIPv6Address(), nic.getMacAddress(), vm.getId(), 
null, work.getLogsequenceNumber(),
                         ingressRules, egressRules, nicSecIps);
                 cmd.setMsId(_serverId);
                 if (s_logger.isDebugEnabled()) {