You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by re...@apache.org on 2015/11/02 14:17:24 UTC
[1/2] git commit: updated refs/heads/master to 3d213b6
Repository: cloudstack
Updated Branches:
refs/heads/master abbdb2ef2 -> 3d213b66e
CLOUDSTACK-8940: Wrong value is inserted into nics table netmask field when creating a VM - Fixed
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ba26efcd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ba26efcd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ba26efcd
Branch: refs/heads/master
Commit: ba26efcdf2dd6e24d5764c13fd05fff974a5b58c
Parents: eabf11c
Author: Kshitij Kansal <ka...@gmail.com>
Authored: Wed Oct 7 17:03:00 2015 +0530
Committer: Kshitij Kansal <ka...@gmail.com>
Committed: Thu Oct 29 17:04:58 2015 +0530
----------------------------------------------------------------------
server/src/com/cloud/network/IpAddressManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ba26efcd/server/src/com/cloud/network/IpAddressManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/IpAddressManagerImpl.java b/server/src/com/cloud/network/IpAddressManagerImpl.java
index 28df971..7699a86 100644
--- a/server/src/com/cloud/network/IpAddressManagerImpl.java
+++ b/server/src/com/cloud/network/IpAddressManagerImpl.java
@@ -1932,9 +1932,9 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
}
- // nic ip address isn ot set here. Because the DHCP is external to cloudstack
+ // nic ip address is not set here. Because the DHCP is external to cloudstack
nic.setIPv4Gateway(network.getGateway());
- nic.setIPv4Netmask(network.getCidr());
+ nic.setIPv4Netmask(NetUtils.getCidrNetmask(network.getCidr()));
List<VlanVO> vlan = _vlanDao.listVlansByNetworkId(network.getId());
[2/2] git commit: updated refs/heads/master to 3d213b6
Posted by re...@apache.org.
Merge pull request #916 from kansal/CLOUDSTACK-8940
CLOUDSTACK-8940: Wrong value is inserted into nics table netmask field when creating a VM - Fixed
Problem: When creating a VM in shared network with no service, the value of netmask is added in the table in the CIDR format unlike other cases where it is added as normal string in the format xxx.xxx.xxx.xxx. The netmask column in the nics table has a length of 15 chars which gets violated if the CIDR exceeds it(Max CIDR length can be 18).
Fix: Before storing the netmask convert from CIDR to native format.
* pr/916:
CLOUDSTACK-8940: Wrong value is inserted into nics table netmask field when creating a VM - Fixed
Signed-off-by: Remi Bergsma <gi...@remi.nl>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3d213b66
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3d213b66
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3d213b66
Branch: refs/heads/master
Commit: 3d213b66e78f4a11af4847dbec41c4bae0c50586
Parents: abbdb2e ba26efc
Author: Remi Bergsma <gi...@remi.nl>
Authored: Mon Nov 2 14:16:28 2015 +0100
Committer: Remi Bergsma <gi...@remi.nl>
Committed: Mon Nov 2 14:16:29 2015 +0100
----------------------------------------------------------------------
server/src/com/cloud/network/IpAddressManagerImpl.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------