You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sw...@apache.org on 2016/05/12 15:04:32 UTC
[03/17] git commit: updated refs/heads/4.8 to dbbc37e
CLOUDSTACK-9287 - Generate new mac address if router is redundant and nic profile exists
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f921ec68
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f921ec68
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f921ec68
Branch: refs/heads/4.8
Commit: f921ec686bcf339968040c57bf0ae9fceffd8fed
Parents: ef115ab
Author: Wilder Rodrigues <wr...@schubergphilis.com>
Authored: Sat Feb 13 12:59:20 2016 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Sat Apr 9 21:13:28 2016 +0200
----------------------------------------------------------------------
server/src/com/cloud/network/router/NicProfileHelperImpl.java | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f921ec68/server/src/com/cloud/network/router/NicProfileHelperImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/router/NicProfileHelperImpl.java b/server/src/com/cloud/network/router/NicProfileHelperImpl.java
index 4a0faa9..2fc5a42 100644
--- a/server/src/com/cloud/network/router/NicProfileHelperImpl.java
+++ b/server/src/com/cloud/network/router/NicProfileHelperImpl.java
@@ -85,6 +85,11 @@ public class NicProfileHelperImpl implements NicProfileHelper {
new NicProfile(privateNic, privateNetwork, privateNic.getBroadcastUri(), privateNic.getIsolationUri(), _networkModel.getNetworkRate(
privateNetwork.getId(), router.getId()), _networkModel.isSecurityGroupSupportedInNetwork(privateNetwork), _networkModel.getNetworkTag(
router.getHypervisorType(), privateNetwork));
+
+ if (router.getIsRedundantRouter()) {
+ String newMacAddress = NetUtils.long2Mac(NetUtils.createSequenceBasedMacAddress(ipVO.getMacAddress()));
+ privateNicProfile.setMacAddress(newMacAddress);
+ }
} else {
final String netmask = NetUtils.getCidrNetmask(privateNetwork.getCidr());
final PrivateIpAddress ip =