security group: replace vm.getPrivateMacAddress() with nic.getMacAddress() (#7293)

soreana · web-flow · commit add64bd7e69e · 2023-08-18T10:49:16.000+02:00
diff --git 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 void doInTransactionWithoutResult(TransactionStatus status) {
                             } 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
@@ -188,7 +188,7 @@ public void sendRulesetUpdates(SecurityGroupWork work) {
                     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()) {

Original file line number	Diff line number	Diff line change
`@@ -1071,7 +1071,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {`
`1071`	`1071`	`} else {`
`1072`	`1072`	`return;`
`1073`	`1073`	`}`
`1074`		`- SecurityGroupRulesCmd cmd = generateRulesetCmd(vm.getInstanceName(), nic.getIPv4Address(), nic.getIPv6Address(), vm.getPrivateMacAddress(), vm.getId(),`
	`1074`	`+ SecurityGroupRulesCmd cmd = generateRulesetCmd(vm.getInstanceName(), nic.getIPv4Address(), nic.getIPv6Address(), nic.getMacAddress(), vm.getId(),`
`1075`	`1075`	`generateRulesetSignature(ingressRules, egressRules), seqnum, ingressRules, egressRules, nicSecIps);`
`1076`	`1076`	`Commands cmds = new Commands(cmd);`
`1077`	`1077`	`try {`
Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ public void sendRulesetUpdates(SecurityGroupWork work) {`
`188`	`188`	`return;`
`189`	`189`	`}`
`190`	`190`	`SecurityGroupRulesCmd cmd =`
`191`		`- generateRulesetCmd(vm.getInstanceName(), nic.getIPv4Address(), nic.getIPv6Address(), vm.getPrivateMacAddress(), vm.getId(), null, work.getLogsequenceNumber(),`
	`191`	`+ generateRulesetCmd(vm.getInstanceName(), nic.getIPv4Address(), nic.getIPv6Address(), nic.getMacAddress(), vm.getId(), null, work.getLogsequenceNumber(),`
`192`	`192`	`ingressRules, egressRules, nicSecIps);`
`193`	`193`	`cmd.setMsId(_serverId);`
`194`	`194`	`if (s_logger.isDebugEnabled()) {`