apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactored Nic.java for readability.

Browse Source 
Changed methodnames according to Nic.java refactor.

Fixed NicVO.java due to regression from Nic.java refactor.

Fixed VmWareGuru.java after Nic.java refactor.

See issue CLOUDSTACK-8736 for ongoing effort to clean up network code.
This commit is contained in:
Boris Schrijver 2015-08-17 16:20:51 +02:00
parent 5db3371840
commit c30ba1df0b
41 changed files with 308 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
api/src/com/cloud/vm/Nic.java
View File

@ -115,14 +115,8 @@ public interface Nic extends Identity, InternalIdentity {
boolean isDefaultNic(); boolean isDefaultNic();
String getIp4Address();
String getMacAddress(); String getMacAddress();
String getNetmask();
String getGateway();
/** /**
* @return network profile id that this * @return network profile id that this
*/ */
@ -145,11 +139,25 @@ public interface Nic extends Identity, InternalIdentity {
AddressFormat getAddressFormat(); AddressFormat getAddressFormat();
String getIp6Gateway();
String getIp6Cidr();
String getIp6Address();
boolean getSecondaryIp(); boolean getSecondaryIp();
//
// IPv4
//
String getIPv4Address();
String getIPv4Netmask();
String getIPv4Gateway();
//
// IPv6
//
String getIPv6Gateway();
String getIPv6Cidr();
String getIPv6Address();
} }

18
api/src/com/cloud/vm/NicProfile.java
View File

@ -83,13 +83,13 @@ public class NicProfile implements InternalIdentity, Serializable {
trafficType = network.getTrafficType(); trafficType = network.getTrafficType();
format = nic.getAddressFormat(); format = nic.getAddressFormat();
ipv4Address = nic.getIp4Address(); ipv4Address = nic.getIPv4Address();
ipv4Netmask = nic.getNetmask(); ipv4Netmask = nic.getIPv4Netmask();
ipv4Gateway = nic.getGateway(); ipv4Gateway = nic.getIPv4Gateway();
ipv6Address = nic.getIp6Address(); ipv6Address = nic.getIPv6Address();
ipv6Gateway = nic.getIp6Gateway(); ipv6Gateway = nic.getIPv6Gateway();
ipv6Cidr = nic.getIp6Cidr(); ipv6Cidr = nic.getIPv6Cidr();
macAddress = nic.getMacAddress(); macAddress = nic.getMacAddress();
reservationId = nic.getReservationId(); reservationId = nic.getReservationId();
@ -114,11 +114,11 @@ public class NicProfile implements InternalIdentity, Serializable {
this.requestedIPv6 = requestedIPv6; this.requestedIPv6 = requestedIPv6;
} }
public NicProfile(ReservationStrategy strategy, String ipv4Address, String macAddress, String gateway, String netmask) { public NicProfile(ReservationStrategy strategy, String ipv4Address, String macAddress, String ipv4gateway, String ipv4netmask) {
format = AddressFormat.Ip4; format = AddressFormat.Ip4;
this.ipv4Address = ipv4Address; this.ipv4Address = ipv4Address;
this.ipv4Gateway = gateway; this.ipv4Gateway = ipv4gateway;
this.ipv4Netmask = netmask; this.ipv4Netmask = ipv4netmask;
this.macAddress = macAddress; this.macAddress = macAddress;
this.strategy = strategy; this.strategy = strategy;
} }

14
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
View File

@ -892,13 +892,13 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
to.setDeviceId(nic.getDeviceId()); to.setDeviceId(nic.getDeviceId());
to.setBroadcastType(config.getBroadcastDomainType()); to.setBroadcastType(config.getBroadcastDomainType());
to.setType(config.getTrafficType()); to.setType(config.getTrafficType());
to.setIp(nic.getIp4Address()); to.setIp(nic.getIPv4Address());
to.setNetmask(nic.getNetmask()); to.setNetmask(nic.getIPv4Netmask());
to.setMac(nic.getMacAddress()); to.setMac(nic.getMacAddress());
to.setDns1(profile.getIPv4Dns1()); to.setDns1(profile.getIPv4Dns1());
to.setDns2(profile.getIPv4Dns2()); to.setDns2(profile.getIPv4Dns2());
if (nic.getGateway() != null) { if (nic.getIPv4Gateway() != null) {
to.setGateway(nic.getGateway()); to.setGateway(nic.getIPv4Gateway());
} else { } else {
to.setGateway(config.getGateway()); to.setGateway(config.getGateway());
} }
@ -1741,7 +1741,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
} }
private boolean isLastNicInSubnet(NicVO nic) { private boolean isLastNicInSubnet(NicVO nic) {
if (_nicDao.listByNetworkIdTypeAndGatewayAndBroadcastUri(nic.getNetworkId(), VirtualMachine.Type.User, nic.getGateway(), nic.getBroadcastUri()).size() > 1) { if (_nicDao.listByNetworkIdTypeAndGatewayAndBroadcastUri(nic.getNetworkId(), VirtualMachine.Type.User, nic.getIPv4Gateway(), nic.getBroadcastUri()).size() > 1) {
return false; return false;
} }
return true; return true;
@ -1753,7 +1753,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
Network network = _networksDao.findById(nic.getNetworkId()); Network network = _networksDao.findById(nic.getNetworkId());
DhcpServiceProvider dhcpServiceProvider = getDhcpServiceProvider(network); DhcpServiceProvider dhcpServiceProvider = getDhcpServiceProvider(network);
try { try {
final NicIpAliasVO ipAlias = _nicIpAliasDao.findByGatewayAndNetworkIdAndState(nic.getGateway(), network.getId(), NicIpAlias.state.active); final NicIpAliasVO ipAlias = _nicIpAliasDao.findByGatewayAndNetworkIdAndState(nic.getIPv4Gateway(), network.getId(), NicIpAlias.state.active);
if (ipAlias != null) { if (ipAlias != null) {
ipAlias.setState(NicIpAlias.state.revoked); ipAlias.setState(NicIpAlias.state.revoked);
Transaction.execute(new TransactionCallbackNoReturn() { Transaction.execute(new TransactionCallbackNoReturn() {
@ -3118,7 +3118,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
String ipAddress = requested.getIPv4Address(); String ipAddress = requested.getIPv4Address();
NicVO nicVO = _nicDao.findByNetworkIdInstanceIdAndBroadcastUri(network.getId(), vm.getId(), broadcastUri); NicVO nicVO = _nicDao.findByNetworkIdInstanceIdAndBroadcastUri(network.getId(), vm.getId(), broadcastUri);
if (nicVO != null) { if (nicVO != null) {
if (ipAddress == null || nicVO.getIp4Address().equals(ipAddress)) { if (ipAddress == null || nicVO.getIPv4Address().equals(ipAddress)) {
nic = _networkModel.getNicProfile(vm, network.getId(), broadcastUri); nic = _networkModel.getNicProfile(vm, network.getId(), broadcastUri);
} }
} }

16
engine/orchestration/test/org/apache/cloudstack/engine/orchestration/NetworkOrchestratorTest.java
View File

@ -17,44 +17,42 @@
package org.apache.cloudstack.engine.orchestration; package org.apache.cloudstack.engine.orchestration;
import static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.never; import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times; import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when; import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.ArrayList;
import java.util.Map; import java.util.Map;
import junit.framework.TestCase;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.mockito.Matchers; import org.mockito.Matchers;
import com.cloud.network.Network; import com.cloud.network.Network;
import com.cloud.network.NetworkModel;
import com.cloud.network.Network.GuestType; import com.cloud.network.Network.GuestType;
import com.cloud.network.Network.Service; import com.cloud.network.Network.Service;
import com.cloud.network.NetworkModel;
import com.cloud.network.Networks.TrafficType; import com.cloud.network.Networks.TrafficType;
import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.NetworkServiceMapDao; import com.cloud.network.dao.NetworkServiceMapDao;
import com.cloud.network.dao.NetworkVO; import com.cloud.network.dao.NetworkVO;
import com.cloud.network.element.DhcpServiceProvider; import com.cloud.network.element.DhcpServiceProvider;
import com.cloud.network.guru.NetworkGuru; import com.cloud.network.guru.NetworkGuru;
import com.cloud.vm.Nic; import com.cloud.vm.Nic;
import com.cloud.vm.NicVO; import com.cloud.vm.NicVO;
import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.VirtualMachine.Type; import com.cloud.vm.VirtualMachine.Type;
import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.dao.NicDao; import com.cloud.vm.dao.NicDao;
import com.cloud.vm.dao.NicIpAliasDao; import com.cloud.vm.dao.NicIpAliasDao;
import com.cloud.vm.dao.NicSecondaryIpDao; import com.cloud.vm.dao.NicSecondaryIpDao;
import junit.framework.TestCase;
/** /**
* NetworkManagerImpl implements NetworkManager. * NetworkManagerImpl implements NetworkManager.
*/ */
@ -106,7 +104,7 @@ public class NetworkOrchestratorTest extends TestCase {
when(testOrchastrator._networkModel.areServicesSupportedInNetwork(network.getId(), Service.Dhcp)).thenReturn(true); when(testOrchastrator._networkModel.areServicesSupportedInNetwork(network.getId(), Service.Dhcp)).thenReturn(true);
when(network.getTrafficType()).thenReturn(TrafficType.Guest); when(network.getTrafficType()).thenReturn(TrafficType.Guest);
when(network.getGuestType()).thenReturn(GuestType.Shared); when(network.getGuestType()).thenReturn(GuestType.Shared);
when(testOrchastrator._nicDao.listByNetworkIdTypeAndGatewayAndBroadcastUri(nic.getNetworkId(), VirtualMachine.Type.User, nic.getGateway(), nic.getBroadcastUri())).thenReturn(new ArrayList<NicVO>()); when(testOrchastrator._nicDao.listByNetworkIdTypeAndGatewayAndBroadcastUri(nic.getNetworkId(), VirtualMachine.Type.User, nic.getIPv4Gateway(), nic.getBroadcastUri())).thenReturn(new ArrayList<NicVO>());

50
engine/schema/src/com/cloud/vm/NicVO.java
View File

@ -48,13 +48,13 @@ public class NicVO implements Nic {
Long instanceId; Long instanceId;
@Column(name = "ip4_address") @Column(name = "ip4_address")
String ip4Address; String iPv4Address;
@Column(name = "ip6_address") @Column(name = "ip6_address")
String ip6Address; String iPv6Address;
@Column(name = "netmask") @Column(name = "netmask")
String netmask; String iPv4Netmask;
@Column(name = "isolation_uri") @Column(name = "isolation_uri")
URI isolationUri; URI isolationUri;
@ -66,7 +66,7 @@ public class NicVO implements Nic {
URI broadcastUri; URI broadcastUri;
@Column(name = "gateway") @Column(name = "gateway")
String gateway; String iPv4Gateway;
@Column(name = "mac_address") @Column(name = "mac_address")
String macAddress; String macAddress;
@ -98,10 +98,10 @@ public class NicVO implements Nic {
boolean defaultNic; boolean defaultNic;
@Column(name = "ip6_gateway") @Column(name = "ip6_gateway")
String ip6Gateway; String iPv6Gateway;
@Column(name = "ip6_cidr") @Column(name = "ip6_cidr")
String ip6Cidr; String iPv6Cidr;
@Column(name = "strategy") @Column(name = "strategy")
@Enumerated(value = EnumType.STRING) @Enumerated(value = EnumType.STRING)
@ -132,12 +132,12 @@ public class NicVO implements Nic {
} }
@Override @Override
public String getIp4Address() { public String getIPv4Address() {
return ip4Address; return iPv4Address;
} }
public void setIp4Address(String address) { public void setIp4Address(String address) {
ip4Address = address; iPv4Address = address;
} }
@Override @Override
@ -164,26 +164,26 @@ public class NicVO implements Nic {
} }
@Override @Override
public String getIp6Address() { public String getIPv6Address() {
return ip6Address; return iPv6Address;
} }
public void setIp6Address(String ip6Address) { public void setIp6Address(String ip6Address) {
this.ip6Address = ip6Address; this.iPv6Address = ip6Address;
} }
@Override @Override
public String getNetmask() { public String getIPv4Netmask() {
return netmask; return iPv4Netmask;
} }
@Override @Override
public String getGateway() { public String getIPv4Gateway() {
return gateway; return iPv4Gateway;
} }
public void setGateway(String gateway) { public void setGateway(String gateway) {
this.gateway = gateway; this.iPv4Gateway = gateway;
} }
@Override @Override
@ -196,7 +196,7 @@ public class NicVO implements Nic {
} }
public void setNetmask(String netmask) { public void setNetmask(String netmask) {
this.netmask = netmask; this.iPv4Netmask = netmask;
} }
@Override @Override
@ -322,7 +322,7 @@ public class NicVO implements Nic {
.append("-") .append("-")
.append(reservationId) .append(reservationId)
.append("-") .append("-")
.append(ip4Address) .append(iPv4Address)
.append("]") .append("]")
.toString(); .toString();
} }
@ -342,21 +342,21 @@ public class NicVO implements Nic {
} }
@Override @Override
public String getIp6Gateway() { public String getIPv6Gateway() {
return ip6Gateway; return iPv6Gateway;
} }
public void setIp6Gateway(String ip6Gateway) { public void setIp6Gateway(String ip6Gateway) {
this.ip6Gateway = ip6Gateway; this.iPv6Gateway = ip6Gateway;
} }
@Override @Override
public String getIp6Cidr() { public String getIPv6Cidr() {
return ip6Cidr; return iPv6Cidr;
} }
public void setIp6Cidr(String ip6Cidr) { public void setIp6Cidr(String ip6Cidr) {
this.ip6Cidr = ip6Cidr; this.iPv6Cidr = ip6Cidr;
} }
@Override @Override

10
engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java
View File

@ -59,9 +59,9 @@ public class NicDaoImpl extends GenericDaoBase<NicVO, Long> implements NicDao {
AllFieldsSearch = createSearchBuilder(); AllFieldsSearch = createSearchBuilder();
AllFieldsSearch.and("instance", AllFieldsSearch.entity().getInstanceId(), Op.EQ); AllFieldsSearch.and("instance", AllFieldsSearch.entity().getInstanceId(), Op.EQ);
AllFieldsSearch.and("network", AllFieldsSearch.entity().getNetworkId(), Op.EQ); AllFieldsSearch.and("network", AllFieldsSearch.entity().getNetworkId(), Op.EQ);
AllFieldsSearch.and("gateway", AllFieldsSearch.entity().getGateway(), Op.EQ); AllFieldsSearch.and("gateway", AllFieldsSearch.entity().getIPv4Gateway(), Op.EQ);
AllFieldsSearch.and("vmType", AllFieldsSearch.entity().getVmType(), Op.EQ); AllFieldsSearch.and("vmType", AllFieldsSearch.entity().getVmType(), Op.EQ);
AllFieldsSearch.and("address", AllFieldsSearch.entity().getIp4Address(), Op.EQ); AllFieldsSearch.and("address", AllFieldsSearch.entity().getIPv4Address(), Op.EQ);
AllFieldsSearch.and("isDefault", AllFieldsSearch.entity().isDefaultNic(), Op.EQ); AllFieldsSearch.and("isDefault", AllFieldsSearch.entity().isDefaultNic(), Op.EQ);
AllFieldsSearch.and("broadcastUri", AllFieldsSearch.entity().getBroadcastUri(), Op.EQ); AllFieldsSearch.and("broadcastUri", AllFieldsSearch.entity().getBroadcastUri(), Op.EQ);
AllFieldsSearch.and("secondaryip", AllFieldsSearch.entity().getSecondaryIp(), Op.EQ); AllFieldsSearch.and("secondaryip", AllFieldsSearch.entity().getSecondaryIp(), Op.EQ);
@ -70,9 +70,9 @@ public class NicDaoImpl extends GenericDaoBase<NicVO, Long> implements NicDao {
AllFieldsSearch.done(); AllFieldsSearch.done();
IpSearch = createSearchBuilder(String.class); IpSearch = createSearchBuilder(String.class);
IpSearch.select(null, Func.DISTINCT, IpSearch.entity().getIp4Address()); IpSearch.select(null, Func.DISTINCT, IpSearch.entity().getIPv4Address());
IpSearch.and("network", IpSearch.entity().getNetworkId(), Op.EQ); IpSearch.and("network", IpSearch.entity().getNetworkId(), Op.EQ);
IpSearch.and("address", IpSearch.entity().getIp4Address(), Op.NNULL); IpSearch.and("address", IpSearch.entity().getIPv4Address(), Op.NNULL);
IpSearch.done(); IpSearch.done();
NonReleasedSearch = createSearchBuilder(); NonReleasedSearch = createSearchBuilder();
@ -216,7 +216,7 @@ public class NicDaoImpl extends GenericDaoBase<NicVO, Long> implements NicDao {
sc.setParameters("instance", instanceId); sc.setParameters("instance", instanceId);
NicVO nicVo = findOneBy(sc); NicVO nicVo = findOneBy(sc);
if (nicVo != null) { if (nicVo != null) {
return nicVo.getIp4Address(); return nicVo.getIPv4Address();
} }
return null; return null;
} }

8
engine/schema/src/com/cloud/vm/dao/UserVmDaoImpl.java
View File

@ -30,12 +30,12 @@ import javax.annotation.PostConstruct;
import javax.ejb.Local; import javax.ejb.Local;
import javax.inject.Inject; import javax.inject.Inject;
import com.cloud.utils.Pair;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import com.cloud.server.ResourceTag.ResourceObjectType; import com.cloud.server.ResourceTag.ResourceObjectType;
import com.cloud.tags.dao.ResourceTagDao; import com.cloud.tags.dao.ResourceTagDao;
import com.cloud.user.Account; import com.cloud.user.Account;
import com.cloud.utils.Pair;
import com.cloud.utils.db.Attribute; import com.cloud.utils.db.Attribute;
import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericDaoBase;
import com.cloud.utils.db.GenericSearchBuilder; import com.cloud.utils.db.GenericSearchBuilder;
@ -185,7 +185,7 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use
SearchBuilder<NicVO> nicSearch = _nicDao.createSearchBuilder(); SearchBuilder<NicVO> nicSearch = _nicDao.createSearchBuilder();
nicSearch.and("networkId", nicSearch.entity().getNetworkId(), SearchCriteria.Op.EQ); nicSearch.and("networkId", nicSearch.entity().getNetworkId(), SearchCriteria.Op.EQ);
nicSearch.and("ip4Address", nicSearch.entity().getIp4Address(), SearchCriteria.Op.NNULL); nicSearch.and("ip4Address", nicSearch.entity().getIPv4Address(), SearchCriteria.Op.NNULL);
AccountDataCenterVirtualSearch = createSearchBuilder(); AccountDataCenterVirtualSearch = createSearchBuilder();
AccountDataCenterVirtualSearch.and("account", AccountDataCenterVirtualSearch.entity().getAccountId(), SearchCriteria.Op.EQ); AccountDataCenterVirtualSearch.and("account", AccountDataCenterVirtualSearch.entity().getAccountId(), SearchCriteria.Op.EQ);
@ -307,8 +307,8 @@ public class UserVmDaoImpl extends GenericDaoBase<UserVmVO, Long> implements Use
SearchBuilder<NicVO> nicSearch = _nicDao.createSearchBuilder(); SearchBuilder<NicVO> nicSearch = _nicDao.createSearchBuilder();
nicSearch.and("networkId", nicSearch.entity().getNetworkId(), SearchCriteria.Op.EQ); nicSearch.and("networkId", nicSearch.entity().getNetworkId(), SearchCriteria.Op.EQ);
nicSearch.and("removed", nicSearch.entity().getRemoved(), SearchCriteria.Op.NULL); nicSearch.and("removed", nicSearch.entity().getRemoved(), SearchCriteria.Op.NULL);
nicSearch.and().op("ip4Address", nicSearch.entity().getIp4Address(), SearchCriteria.Op.NNULL); nicSearch.and().op("ip4Address", nicSearch.entity().getIPv4Address(), SearchCriteria.Op.NNULL);
nicSearch.or("ip6Address", nicSearch.entity().getIp6Address(), SearchCriteria.Op.NNULL); nicSearch.or("ip6Address", nicSearch.entity().getIPv6Address(), SearchCriteria.Op.NNULL);
nicSearch.cp(); nicSearch.cp();
UserVmSearch = createSearchBuilder(); UserVmSearch = createSearchBuilder();

6
plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalPingServiceImpl.java
View File

@ -138,10 +138,10 @@ public class BareMetalPingServiceImpl extends BareMetalPxeServiceBase implements
HostVO host = _hostDao.findById(hostId); HostVO host = _hostDao.findById(hostId);
DataCenterVO dc = _dcDao.findById(host.getDataCenterId()); DataCenterVO dc = _dcDao.findById(host.getDataCenterId());
NicVO nic = nics.get(0); NicVO nic = nics.get(0);
String mask = nic.getNetmask(); String mask = nic.getIPv4Netmask();
String mac = nic.getMacAddress(); String mac = nic.getMacAddress();
String ip = nic.getIp4Address(); String ip = nic.getIPv4Address();
String gateway = nic.getGateway(); String gateway = nic.getIPv4Gateway();
String dns = dc.getDns1(); String dns = dc.getDns1();
if (dns == null) { if (dns == null) {
dns = dc.getDns2(); dns = dc.getDns2();

44
plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
View File

@ -18,6 +18,24 @@
// Automatically generated by addcopyright.py at 01/29/2013 // Automatically generated by addcopyright.py at 01/29/2013
package com.cloud.baremetal.networkservice; package com.cloud.baremetal.networkservice;
import java.io.File;
import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import javax.ejb.Local;
import javax.inject.Inject;
import org.apache.cloudstack.api.AddBaremetalKickStartPxeCmd;
import org.apache.cloudstack.api.AddBaremetalPxeCmd;
import org.apache.cloudstack.api.ListBaremetalPxeServersCmd;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.log4j.Logger;
import com.cloud.agent.api.Answer; import com.cloud.agent.api.Answer;
import com.cloud.agent.api.baremetal.IpmISetBootDevCommand; import com.cloud.agent.api.baremetal.IpmISetBootDevCommand;
import com.cloud.agent.api.baremetal.IpmISetBootDevCommand.BootDev; import com.cloud.agent.api.baremetal.IpmISetBootDevCommand.BootDev;
@ -61,22 +79,6 @@ import com.cloud.vm.ReservationContext;
import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.VirtualMachineProfile;
import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.DomainRouterDao;
import com.cloud.vm.dao.NicDao; import com.cloud.vm.dao.NicDao;
import org.apache.cloudstack.api.AddBaremetalKickStartPxeCmd;
import org.apache.cloudstack.api.AddBaremetalPxeCmd;
import org.apache.cloudstack.api.ListBaremetalPxeServersCmd;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.log4j.Logger;
import javax.ejb.Local;
import javax.inject.Inject;
import java.io.File;
import java.net.URI;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Local(value = BaremetalPxeService.class) @Local(value = BaremetalPxeService.class)
public class BaremetalKickStartServiceImpl extends BareMetalPxeServiceBase implements BaremetalPxeService { public class BaremetalKickStartServiceImpl extends BareMetalPxeServiceBase implements BaremetalPxeService {
@ -229,16 +231,16 @@ public class BaremetalKickStartServiceImpl extends BareMetalPxeServiceBase imple
List<String> tuple = parseKickstartUrl(profile); List<String> tuple = parseKickstartUrl(profile);
String cmd = String.format("/opt/cloud/bin/prepare_pxe.sh %s %s %s %s %s %s", tuple.get(1), tuple.get(2), profile.getTemplate().getUuid(), String cmd = String.format("/opt/cloud/bin/prepare_pxe.sh %s %s %s %s %s %s", tuple.get(1), tuple.get(2), profile.getTemplate().getUuid(),
String.format("01-%s", nic.getMacAddress().replaceAll(":", "-")).toLowerCase(), tuple.get(0), nic.getMacAddress().toLowerCase()); String.format("01-%s", nic.getMacAddress().replaceAll(":", "-")).toLowerCase(), tuple.get(0), nic.getMacAddress().toLowerCase());
s_logger.debug(String.format("prepare pxe on virtual router[ip:%s], cmd: %s", mgmtNic.getIp4Address(), cmd)); s_logger.debug(String.format("prepare pxe on virtual router[ip:%s], cmd: %s", mgmtNic.getIPv4Address(), cmd));
Pair<Boolean, String> ret = SshHelper.sshExecute(mgmtNic.getIp4Address(), 3922, "root", getSystemVMKeyFile(), null, cmd); Pair<Boolean, String> ret = SshHelper.sshExecute(mgmtNic.getIPv4Address(), 3922, "root", getSystemVMKeyFile(), null, cmd);
if (!ret.first()) { if (!ret.first()) {
throw new CloudRuntimeException(String.format("failed preparing PXE in virtual router[id:%s], because %s", vr.getId(), ret.second())); throw new CloudRuntimeException(String.format("failed preparing PXE in virtual router[id:%s], because %s", vr.getId(), ret.second()));
} }
//String internalServerIp = "10.223.110.231"; //String internalServerIp = "10.223.110.231";
cmd = String.format("/opt/cloud/bin/baremetal_snat.sh %s %s %s", mgmtNic.getIp4Address(), internalServerIp, mgmtNic.getGateway()); cmd = String.format("/opt/cloud/bin/baremetal_snat.sh %s %s %s", mgmtNic.getIPv4Address(), internalServerIp, mgmtNic.getIPv4Gateway());
s_logger.debug(String.format("prepare SNAT on virtual router[ip:%s], cmd: %s", mgmtNic.getIp4Address(), cmd)); s_logger.debug(String.format("prepare SNAT on virtual router[ip:%s], cmd: %s", mgmtNic.getIPv4Address(), cmd));
ret = SshHelper.sshExecute(mgmtNic.getIp4Address(), 3922, "root", getSystemVMKeyFile(), null, cmd); ret = SshHelper.sshExecute(mgmtNic.getIPv4Address(), 3922, "root", getSystemVMKeyFile(), null, cmd);
if (!ret.first()) { if (!ret.first()) {
throw new CloudRuntimeException(String.format("failed preparing PXE in virtual router[id:%s], because %s", vr.getId(), ret.second())); throw new CloudRuntimeException(String.format("failed preparing PXE in virtual router[id:%s], because %s", vr.getId(), ret.second()));
} }

2
plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java
View File

@ -193,7 +193,7 @@ public class BaremetalPxeManagerImpl extends ManagerBase implements BaremetalPxe
String serviceOffering = _serviceOfferingDao.findByIdIncludingRemoved(vm.getId(), vm.getServiceOfferingId()).getDisplayText(); String serviceOffering = _serviceOfferingDao.findByIdIncludingRemoved(vm.getId(), vm.getServiceOfferingId()).getDisplayText();
String zoneName = _dcDao.findById(vm.getDataCenterId()).getName(); String zoneName = _dcDao.findById(vm.getDataCenterId()).getName();
NicVO nvo = _nicDao.findById(nic.getId()); NicVO nvo = _nicDao.findById(nic.getId());
VmDataCommand cmd = new VmDataCommand(nvo.getIp4Address(), vm.getInstanceName(), _ntwkModel.getExecuteInSeqNtwkElmtCmd()); VmDataCommand cmd = new VmDataCommand(nvo.getIPv4Address(), vm.getInstanceName(), _ntwkModel.getExecuteInSeqNtwkElmtCmd());
// if you add new metadata files, also edit systemvm/patches/debian/config/var/www/html/latest/.htaccess // if you add new metadata files, also edit systemvm/patches/debian/config/var/www/html/latest/.htaccess
cmd.addVmData("userdata", "user-data", vm.getUserData()); cmd.addVmData("userdata", "user-data", vm.getUserData());
cmd.addVmData("metadata", "service-offering", StringUtils.unicodeEscape(serviceOffering)); cmd.addVmData("metadata", "service-offering", StringUtils.unicodeEscape(serviceOffering));

11
plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
View File

@ -27,8 +27,6 @@ import java.util.UUID;
import javax.ejb.Local; import javax.ejb.Local;
import javax.inject.Inject; import javax.inject.Inject;
import org.apache.log4j.Logger;
import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore; import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore;
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory;
import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo;
@ -41,6 +39,7 @@ import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.cloudstack.storage.to.VolumeObjectTO; import org.apache.cloudstack.storage.to.VolumeObjectTO;
import org.apache.log4j.Logger;
import com.cloud.agent.api.BackupSnapshotCommand; import com.cloud.agent.api.BackupSnapshotCommand;
import com.cloud.agent.api.Command; import com.cloud.agent.api.Command;
@ -267,10 +266,10 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru, Co
} catch (InsufficientAddressCapacityException e) { } catch (InsufficientAddressCapacityException e) {
throw new CloudRuntimeException("unable to allocate mac address on network: " + networkId); throw new CloudRuntimeException("unable to allocate mac address on network: " + networkId);
} }
nicTo.setDns1(publicNicProfile.getDns1()); nicTo.setDns1(publicNicProfile.getIPv4Dns1());
nicTo.setDns2(publicNicProfile.getDns2()); nicTo.setDns2(publicNicProfile.getIPv4Dns2());
if (publicNicProfile.getGateway() != null) { if (publicNicProfile.getIPv4Gateway() != null) {
nicTo.setGateway(publicNicProfile.getGateway()); nicTo.setGateway(publicNicProfile.getIPv4Gateway());
} else { } else {
nicTo.setGateway(network.getGateway()); nicTo.setGateway(network.getGateway());
} }

2
plugins/network-elements/bigswitch/src/com/cloud/network/bigswitch/BigSwitchBcfUtils.java
View File

@ -292,7 +292,7 @@ public class BigSwitchBcfUtils {
p.setOwner(BigSwitchBcfApi.getCloudstackInstanceId()); p.setOwner(BigSwitchBcfApi.getCloudstackInstanceId());
List<AttachmentData.Attachment.IpAddress> ipList = new ArrayList<AttachmentData.Attachment.IpAddress>(); List<AttachmentData.Attachment.IpAddress> ipList = new ArrayList<AttachmentData.Attachment.IpAddress>();
ipList.add(new AttachmentData().getAttachment().new IpAddress(nic.getIp4Address())); ipList.add(new AttachmentData().getAttachment().new IpAddress(nic.getIPv4Address()));
p.setIpAddresses(ipList); p.setIpAddresses(ipList);
p.setId(nic.getUuid()); p.setId(nic.getUuid());

8
plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
View File

@ -480,7 +480,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements In
maxconn = offering.getConcurrentConnections().toString(); maxconn = offering.getConcurrentConnections().toString();
} }
final LoadBalancerConfigCommand cmd = final LoadBalancerConfigCommand cmd =
new LoadBalancerConfigCommand(lbs, guestNic.getIp4Address(), guestNic.getIp4Address(), internalLbVm.getPrivateIpAddress(), _itMgr.toNicTO(guestNicProfile, new LoadBalancerConfigCommand(lbs, guestNic.getIPv4Address(), guestNic.getIPv4Address(), internalLbVm.getPrivateIpAddress(), _itMgr.toNicTO(guestNicProfile,
internalLbVm.getHypervisorType()), internalLbVm.getVpcId(), maxconn, offering.isKeepAliveEnabled()); internalLbVm.getHypervisorType()), internalLbVm.getVpcId(), maxconn, offering.isKeepAliveEnabled());
cmd.lbStatsVisibility = _configDao.getValue(Config.NetworkLBHaproxyStatsVisbility.key()); cmd.lbStatsVisibility = _configDao.getValue(Config.NetworkLBHaproxyStatsVisbility.key());
@ -489,7 +489,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements In
cmd.lbStatsPort = _configDao.getValue(Config.NetworkLBHaproxyStatsPort.key()); cmd.lbStatsPort = _configDao.getValue(Config.NetworkLBHaproxyStatsPort.key());
cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getInternalLbControlIp(internalLbVm.getId())); cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, getInternalLbControlIp(internalLbVm.getId()));
cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, guestNic.getIp4Address()); cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, guestNic.getIPv4Address());
cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, internalLbVm.getInstanceName()); cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME, internalLbVm.getInstanceName());
final DataCenterVO dcVo = _dcDao.findById(internalLbVm.getDataCenterId()); final DataCenterVO dcVo = _dcDao.findById(internalLbVm.getDataCenterId());
cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString()); cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE, dcVo.getNetworkType().toString());
@ -502,7 +502,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements In
for (final NicVO nic : nics) { for (final NicVO nic : nics) {
final Network ntwk = _ntwkModel.getNetwork(nic.getNetworkId()); final Network ntwk = _ntwkModel.getNetwork(nic.getNetworkId());
if (ntwk.getTrafficType() == TrafficType.Control) { if (ntwk.getTrafficType() == TrafficType.Control) {
controlIpAddress = nic.getIp4Address(); controlIpAddress = nic.getIPv4Address();
} }
} }
@ -714,7 +714,7 @@ public class InternalLoadBalancerVMManagerImpl extends ManagerBase implements In
while (it.hasNext()) { while (it.hasNext()) {
final DomainRouterVO vm = it.next(); final DomainRouterVO vm = it.next();
final Nic nic = _nicDao.findByNtwkIdAndInstanceId(guestNetworkId, vm.getId()); final Nic nic = _nicDao.findByNtwkIdAndInstanceId(guestNetworkId, vm.getId());
if (!nic.getIp4Address().equalsIgnoreCase(requestedGuestIp.addr())) { if (!nic.getIPv4Address().equalsIgnoreCase(requestedGuestIp.addr())) {
it.remove(); it.remove();
} }
} }

15
plugins/network-elements/juniper-contrail/src/org/apache/cloudstack/network/contrail/model/VMInterfaceModel.java
View File

@ -19,20 +19,19 @@ package org.apache.cloudstack.network.contrail.model;
import java.io.IOException; import java.io.IOException;
import net.juniper.contrail.api.ApiConnector;
import net.juniper.contrail.api.types.MacAddressesType;
import net.juniper.contrail.api.types.VirtualMachineInterface;
import net.juniper.contrail.api.types.VirtualMachineInterfacePropertiesType;
import org.apache.log4j.Logger;
import org.apache.cloudstack.network.contrail.management.ContrailManager; import org.apache.cloudstack.network.contrail.management.ContrailManager;
import org.apache.log4j.Logger;
import com.cloud.exception.InternalErrorException; import com.cloud.exception.InternalErrorException;
import com.cloud.network.Network; import com.cloud.network.Network;
import com.cloud.vm.NicVO; import com.cloud.vm.NicVO;
import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VMInstanceVO;
import net.juniper.contrail.api.ApiConnector;
import net.juniper.contrail.api.types.MacAddressesType;
import net.juniper.contrail.api.types.VirtualMachineInterface;
import net.juniper.contrail.api.types.VirtualMachineInterfacePropertiesType;
public class VMInterfaceModel extends ModelObjectBase { public class VMInterfaceModel extends ModelObjectBase {
private static final Logger s_logger = Logger.getLogger(VMInterfaceModel.class); private static final Logger s_logger = Logger.getLogger(VMInterfaceModel.class);
@ -78,7 +77,7 @@ public class VMInterfaceModel extends ModelObjectBase {
setProperties(controller, instance, nic); setProperties(controller, instance, nic);
InstanceIpModel ipModel = getInstanceIp(); InstanceIpModel ipModel = getInstanceIp();
String ipAddress = nic.getIp4Address(); String ipAddress = nic.getIPv4Address();
if (ipAddress != null) { if (ipAddress != null) {
if (ipModel == null) { if (ipModel == null) {
ipModel = new InstanceIpModel(_vmName, _deviceId); ipModel = new InstanceIpModel(_vmName, _deviceId);

26
plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/model/InstanceIpModelTest.java
View File

@ -16,33 +16,31 @@
// under the License. // under the License.
package org.apache.cloudstack.network.contrail.model; package org.apache.cloudstack.network.contrail.model;
import java.util.UUID; import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.IOException; import java.io.IOException;
import java.util.UUID;
import org.apache.cloudstack.network.contrail.management.ContrailManagerImpl; import org.apache.cloudstack.network.contrail.management.ContrailManagerImpl;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.junit.Test;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.anyLong;
import static org.mockito.Mockito.anyInt;
import static org.mockito.Mockito.anyString;
import com.cloud.network.Network; import com.cloud.network.Network;
import com.cloud.network.Networks.TrafficType; import com.cloud.network.Networks.TrafficType;
import com.cloud.network.dao.NetworkVO;
import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.NetworkVO;
import com.cloud.vm.NicVO; import com.cloud.vm.NicVO;
import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine;
import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.UserVmDao;
import net.juniper.contrail.api.ApiConnectorMock;
import net.juniper.contrail.api.ApiConnector;
import org.junit.Test;
import junit.framework.TestCase; import junit.framework.TestCase;
import net.juniper.contrail.api.ApiConnector;
import net.juniper.contrail.api.ApiConnectorMock;
public class InstanceIpModelTest extends TestCase { public class InstanceIpModelTest extends TestCase {
private static final Logger s_logger = private static final Logger s_logger =
@ -102,7 +100,7 @@ public class InstanceIpModelTest extends TestCase {
// Create Virtual=Machine-Interface (VMInterface) // Create Virtual=Machine-Interface (VMInterface)
NicVO nic = mock(NicVO.class); NicVO nic = mock(NicVO.class);
when(nic.getIp4Address()).thenReturn("10.1.1.2"); when(nic.getIPv4Address()).thenReturn("10.1.1.2");
when(nic.getMacAddress()).thenReturn("00:01:02:03:04:05"); when(nic.getMacAddress()).thenReturn("00:01:02:03:04:05");
when(nic.getDeviceId()).thenReturn(100); when(nic.getDeviceId()).thenReturn(100);
when(nic.getState()).thenReturn(NicVO.State.Allocated); when(nic.getState()).thenReturn(NicVO.State.Allocated);
@ -128,7 +126,7 @@ public class InstanceIpModelTest extends TestCase {
} }
InstanceIpModel ipModel = new InstanceIpModel(vm.getInstanceName(), nic.getDeviceId()); InstanceIpModel ipModel = new InstanceIpModel(vm.getInstanceName(), nic.getDeviceId());
ipModel.addToVMInterface(vmiModel); ipModel.addToVMInterface(vmiModel);
ipModel.setAddress(nic.getIp4Address()); ipModel.setAddress(nic.getIPv4Address());
try { try {
ipModel.update(controller); ipModel.update(controller);

25
plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/model/VMInterfaceModelTest.java
View File

@ -16,33 +16,32 @@
// under the License. // under the License.
package org.apache.cloudstack.network.contrail.model; package org.apache.cloudstack.network.contrail.model;
import java.util.UUID; import static org.mockito.Matchers.anyInt;
import static org.mockito.Matchers.anyLong;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import java.io.IOException; import java.io.IOException;
import java.util.UUID;
import org.apache.cloudstack.network.contrail.management.ContrailManagerImpl; import org.apache.cloudstack.network.contrail.management.ContrailManagerImpl;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.junit.Test;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.anyLong;
import static org.mockito.Mockito.anyString;
import static org.mockito.Mockito.anyInt;
import com.cloud.network.Network; import com.cloud.network.Network;
import com.cloud.network.Networks.TrafficType; import com.cloud.network.Networks.TrafficType;
import com.cloud.network.dao.NetworkVO;
import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkDao;
import com.cloud.network.dao.NetworkVO;
import com.cloud.vm.NicVO; import com.cloud.vm.NicVO;
import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine;
import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.UserVmDao;
import junit.framework.TestCase;
import net.juniper.contrail.api.ApiConnector;
import net.juniper.contrail.api.ApiConnectorMock; import net.juniper.contrail.api.ApiConnectorMock;
import net.juniper.contrail.api.types.VirtualMachineInterface; import net.juniper.contrail.api.types.VirtualMachineInterface;
import net.juniper.contrail.api.ApiConnector;
import org.junit.Test;
import junit.framework.TestCase;
public class VMInterfaceModelTest extends TestCase { public class VMInterfaceModelTest extends TestCase {
private static final Logger s_logger = private static final Logger s_logger =
@ -103,7 +102,7 @@ public class VMInterfaceModelTest extends TestCase {
// Create Virtual=Machine-Interface (VMInterface) // Create Virtual=Machine-Interface (VMInterface)
NicVO nic = mock(NicVO.class); NicVO nic = mock(NicVO.class);
when(nic.getIp4Address()).thenReturn("10.1.1.2"); when(nic.getIPv4Address()).thenReturn("10.1.1.2");
when(nic.getMacAddress()).thenReturn("00:01:02:03:04:05"); when(nic.getMacAddress()).thenReturn("00:01:02:03:04:05");
when(nic.getDeviceId()).thenReturn(100); when(nic.getDeviceId()).thenReturn(100);
when(nic.getState()).thenReturn(NicVO.State.Allocated); when(nic.getState()).thenReturn(NicVO.State.Allocated);

12
plugins/network-elements/nuage-vsp/src/com/cloud/network/guru/NuageVspGuestNetworkGuru.java
View File

@ -288,7 +288,7 @@ public class NuageVspGuestNetworkGuru extends GuestNetworkGuru {
try { try {
s_logger.debug("Handling deallocate() call back, which is called when a VM is destroyed or interface is removed, " + "to delete VM Interface with IP " s_logger.debug("Handling deallocate() call back, which is called when a VM is destroyed or interface is removed, " + "to delete VM Interface with IP "
+ nic.getIp4Address() + " from a VM " + vm.getInstanceName() + " with state " + vm.getVirtualMachine().getState()); + nic.getIPv4Address() + " from a VM " + vm.getInstanceName() + " with state " + vm.getVirtualMachine().getState());
DomainVO networksDomain = _domainDao.findById(network.getDomainId()); DomainVO networksDomain = _domainDao.findById(network.getDomainId());
NicVO nicFrmDd = _nicDao.findById(nic.getId()); NicVO nicFrmDd = _nicDao.findById(nic.getId());
long networkOfferingId = _ntwkOfferingDao.findById(network.getNetworkOfferingId()).getId(); long networkOfferingId = _ntwkOfferingDao.findById(network.getNetworkOfferingId()).getId();
@ -299,7 +299,7 @@ public class NuageVspGuestNetworkGuru extends GuestNetworkGuru {
vpcUuid = vpcObj.getUuid(); vpcUuid = vpcObj.getUuid();
} }
HostVO nuageVspHost = getNuageVspHost(network.getPhysicalNetworkId()); HostVO nuageVspHost = getNuageVspHost(network.getPhysicalNetworkId());
DeallocateVmVspCommand cmd = new DeallocateVmVspCommand(network.getUuid(), nicFrmDd.getUuid(), nic.getMacAddress(), nic.getIp4Address(), DeallocateVmVspCommand cmd = new DeallocateVmVspCommand(network.getUuid(), nicFrmDd.getUuid(), nic.getMacAddress(), nic.getIPv4Address(),
isL3Network(networkOfferingId), vpcUuid, networksDomain.getUuid(), vm.getInstanceName(), vm.getUuid()); isL3Network(networkOfferingId), vpcUuid, networksDomain.getUuid(), vm.getInstanceName(), vm.getUuid());
DeallocateVmVspAnswer answer = (DeallocateVmVspAnswer)_agentMgr.easySend(nuageVspHost.getId(), cmd); DeallocateVmVspAnswer answer = (DeallocateVmVspAnswer)_agentMgr.easySend(nuageVspHost.getId(), cmd);
if (answer == null || !answer.getResult()) { if (answer == null || !answer.getResult()) {
@ -309,7 +309,7 @@ public class NuageVspGuestNetworkGuru extends GuestNetworkGuru {
} }
} }
} catch (InsufficientVirtualNetworkCapacityException e) { } catch (InsufficientVirtualNetworkCapacityException e) {
s_logger.error("Handling deallocate(). VM " + vm.getInstanceName() + " with NIC IP " + nic.getIp4Address() s_logger.error("Handling deallocate(). VM " + vm.getInstanceName() + " with NIC IP " + nic.getIPv4Address()
+ " is getting destroyed. REST API failed to update the VM state in NuageVsp", e); + " is getting destroyed. REST API failed to update the VM state in NuageVsp", e);
} }
super.deallocate(network, nic, vm); super.deallocate(network, nic, vm);
@ -383,9 +383,9 @@ public class NuageVspGuestNetworkGuru extends GuestNetworkGuru {
for (Map<String, String> interfaces : vmInterfacesDetails) { for (Map<String, String> interfaces : vmInterfacesDetails) {
String macFromNuage = interfaces.get("mac"); String macFromNuage = interfaces.get("mac");
if (StringUtils.equals(macFromNuage, nic.getMacAddress())) { if (StringUtils.equals(macFromNuage, nic.getMacAddress())) {
nic.setIp4Address(interfaces.get("ip4Address")); nic.setIPv4Address(interfaces.get("ip4Address"));
nic.setGateway(interfaces.get("gateway")); nic.setIPv4Gateway(interfaces.get("gateway"));
nic.setNetmask(interfaces.get("netmask")); nic.setIPv4Netmask(interfaces.get("netmask"));
break; break;
} }
} }

7
plugins/network-elements/ovs/src/com/cloud/network/ovs/OvsTunnelManagerImpl.java
View File

@ -27,12 +27,11 @@ import javax.inject.Inject;
import javax.naming.ConfigurationException; import javax.naming.ConfigurationException;
import javax.persistence.EntityExistsException; import javax.persistence.EntityExistsException;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.framework.messagebus.MessageBus; import org.apache.cloudstack.framework.messagebus.MessageBus;
import org.apache.cloudstack.framework.messagebus.MessageSubscriber; import org.apache.cloudstack.framework.messagebus.MessageSubscriber;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import com.cloud.agent.AgentManager; import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer; import com.cloud.agent.api.Answer;
@ -805,7 +804,7 @@ public class OvsTunnelManagerImpl extends ManagerBase implements OvsTunnelManage
Network network = _networkDao.findById(vmNic.getNetworkId()); Network network = _networkDao.findById(vmNic.getNetworkId());
if (network.getTrafficType() == TrafficType.Guest) { if (network.getTrafficType() == TrafficType.Guest) {
OvsVpcPhysicalTopologyConfigCommand.Nic nic = new OvsVpcPhysicalTopologyConfigCommand.Nic( OvsVpcPhysicalTopologyConfigCommand.Nic nic = new OvsVpcPhysicalTopologyConfigCommand.Nic(
vmNic.getIp4Address(), vmNic.getMacAddress(), network.getUuid()); vmNic.getIPv4Address(), vmNic.getMacAddress(), network.getUuid());
vmNics.add(nic); vmNics.add(nic);
} }
} }

10
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -3421,7 +3421,7 @@ public class ApiResponseHelper implements ResponseGenerator {
response.setVmId(vm.getUuid()); response.setVmId(vm.getUuid());
} }
response.setIpaddress(result.getIp4Address()); response.setIpaddress(result.getIPv4Address());
if (result.getSecondaryIp()) { if (result.getSecondaryIp()) {
List<NicSecondaryIpVO> secondaryIps = ApiDBUtils.findNicSecondaryIps(result.getId()); List<NicSecondaryIpVO> secondaryIps = ApiDBUtils.findNicSecondaryIps(result.getId());
@ -3437,12 +3437,12 @@ public class ApiResponseHelper implements ResponseGenerator {
} }
} }
response.setGateway(result.getGateway()); response.setGateway(result.getIPv4Gateway());
response.setNetmask(result.getNetmask()); response.setNetmask(result.getIPv4Netmask());
response.setMacAddress(result.getMacAddress()); response.setMacAddress(result.getMacAddress());
if (result.getIp6Address() != null) { if (result.getIPv6Address() != null) {
response.setIp6Address(result.getIp6Address()); response.setIp6Address(result.getIPv6Address());
} }
response.setDeviceId(String.valueOf(result.getDeviceId())); response.setDeviceId(String.valueOf(result.getDeviceId()));

4
server/src/com/cloud/ha/ManagementIPSystemVMInvestigator.java
View File

@ -71,13 +71,13 @@ public class ManagementIPSystemVMInvestigator extends AbstractInvestigatorImpl {
} }
for (Nic nic : nics) { for (Nic nic : nics) {
if (nic.getIp4Address() == null) { if (nic.getIPv4Address() == null) {
continue; continue;
} }
// get the data center IP address, find a host on the pod, use that host to ping the data center IP address // get the data center IP address, find a host on the pod, use that host to ping the data center IP address
List<Long> otherHosts = findHostByPod(vmHost.getPodId(), vm.getHostId()); List<Long> otherHosts = findHostByPod(vmHost.getPodId(), vm.getHostId());
for (Long otherHost : otherHosts) { for (Long otherHost : otherHosts) {
Status vmState = testIpAddress(otherHost, nic.getIp4Address()); Status vmState = testIpAddress(otherHost, nic.getIPv4Address());
assert vmState != null; assert vmState != null;
// In case of Status.Unknown, next host will be tried // In case of Status.Unknown, next host will be tried
if (vmState == Status.Up) { if (vmState == Status.Up) {

4
server/src/com/cloud/ha/UserVmDomRInvestigator.java
View File

@ -70,7 +70,7 @@ public class UserVmDomRInvestigator extends AbstractInvestigatorImpl {
List<? extends Nic> nics = _networkMgr.getNicsForTraffic(userVm.getId(), TrafficType.Guest); List<? extends Nic> nics = _networkMgr.getNicsForTraffic(userVm.getId(), TrafficType.Guest);
for (Nic nic : nics) { for (Nic nic : nics) {
if (nic.getIp4Address() == null) { if (nic.getIPv4Address() == null) {
continue; continue;
} }
@ -154,7 +154,7 @@ public class UserVmDomRInvestigator extends AbstractInvestigatorImpl {
} }
private Boolean testUserVM(VirtualMachine vm, Nic nic, VirtualRouter router) { private Boolean testUserVM(VirtualMachine vm, Nic nic, VirtualRouter router) {
String privateIp = nic.getIp4Address(); String privateIp = nic.getIPv4Address();
String routerPrivateIp = router.getPrivateIpAddress(); String routerPrivateIp = router.getPrivateIpAddress();
List<Long> otherHosts = new ArrayList<Long>(); List<Long> otherHosts = new ArrayList<Long>();

9
server/src/com/cloud/network/ExternalDeviceUsageManagerImpl.java
View File

@ -29,11 +29,10 @@ import javax.ejb.Local;
import javax.inject.Inject; import javax.inject.Inject;
import javax.naming.ConfigurationException; import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.managed.context.ManagedContextRunnable; import org.apache.cloudstack.managed.context.ManagedContextRunnable;
import org.apache.log4j.Logger;
import org.springframework.stereotype.Component;
import com.cloud.agent.AgentManager; import com.cloud.agent.AgentManager;
import com.cloud.agent.api.ExternalNetworkResourceUsageAnswer; import com.cloud.agent.api.ExternalNetworkResourceUsageAnswer;
@ -272,7 +271,7 @@ public class ExternalDeviceUsageManagerImpl extends ManagerBase implements Exter
if (mapping != null) { if (mapping != null) {
NicVO nic = _nicDao.findById(mapping.getNicId()); NicVO nic = _nicDao.findById(mapping.getNicId());
String loadBalancingIpAddress = nic.getIp4Address(); String loadBalancingIpAddress = nic.getIPv4Address();
bytesSentAndReceived = lbAnswer.ipBytes.get(loadBalancingIpAddress); bytesSentAndReceived = lbAnswer.ipBytes.get(loadBalancingIpAddress);
if (bytesSentAndReceived != null) { if (bytesSentAndReceived != null) {
@ -542,7 +541,7 @@ public class ExternalDeviceUsageManagerImpl extends ManagerBase implements Exter
if (mapping != null) { if (mapping != null) {
NicVO nic = _nicDao.findById(mapping.getNicId()); NicVO nic = _nicDao.findById(mapping.getNicId());
String loadBalancingIpAddress = nic.getIp4Address(); String loadBalancingIpAddress = nic.getIPv4Address();
bytesSentAndReceived = answer.ipBytes.get(loadBalancingIpAddress); bytesSentAndReceived = answer.ipBytes.get(loadBalancingIpAddress);
if (bytesSentAndReceived != null) { if (bytesSentAndReceived != null) {

5
server/src/com/cloud/network/ExternalFirewallDeviceManagerImpl.java
View File

@ -25,13 +25,12 @@ import java.util.Map;
import javax.inject.Inject; import javax.inject.Inject;
import javax.naming.ConfigurationException; import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.response.ExternalFirewallResponse; import org.apache.cloudstack.api.response.ExternalFirewallResponse;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice;
import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager; import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer; import com.cloud.agent.api.Answer;
@ -545,7 +544,7 @@ public abstract class ExternalFirewallDeviceManagerImpl extends AdapterBase impl
if (!add) { if (!add) {
List<NicVO> nics = _nicDao.listByNetworkId(network.getId()); List<NicVO> nics = _nicDao.listByNetworkId(network.getId());
for (NicVO nic : nics) { for (NicVO nic : nics) {
if (nic.getVmType() == null && nic.getReservationStrategy().equals(ReservationStrategy.PlaceHolder) && nic.getIp4Address().equals(network.getGateway())) { if (nic.getVmType() == null && nic.getReservationStrategy().equals(ReservationStrategy.PlaceHolder) && nic.getIPv4Address().equals(network.getGateway())) {
s_logger.debug("Removing placeholder nic " + nic + " for the network " + network); s_logger.debug("Removing placeholder nic " + nic + " for the network " + network);
_nicDao.remove(nic.getId()); _nicDao.remove(nic.getId());
} }

15
server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java
View File

@ -27,13 +27,12 @@ import java.util.UUID;
import javax.inject.Inject; import javax.inject.Inject;
import javax.naming.ConfigurationException; import javax.naming.ConfigurationException;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.response.ExternalLoadBalancerResponse; import org.apache.cloudstack.api.response.ExternalLoadBalancerResponse;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice;
import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager; import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer; import com.cloud.agent.api.Answer;
@ -821,7 +820,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase
// On the firewall provider for the network, create a static NAT rule between the source IP // On the firewall provider for the network, create a static NAT rule between the source IP
// address and the load balancing IP address // address and the load balancing IP address
try { try {
applyStaticNatRuleForInlineLBRule(zone, network, revoked, srcIp, loadBalancingIpNic.getIp4Address()); applyStaticNatRuleForInlineLBRule(zone, network, revoked, srcIp, loadBalancingIpNic.getIPv4Address());
} catch (ResourceUnavailableException ex) { } catch (ResourceUnavailableException ex) {
// Rollback db operation // Rollback db operation
_inlineLoadBalancerNicMapDao.expunge(mapping.getId()); _inlineLoadBalancerNicMapDao.expunge(mapping.getId());
@ -843,7 +842,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase
if (count == 0) { if (count == 0) {
// On the firewall provider for the network, delete the static NAT rule between the source IP // On the firewall provider for the network, delete the static NAT rule between the source IP
// address and the load balancing IP address // address and the load balancing IP address
applyStaticNatRuleForInlineLBRule(zone, network, revoked, srcIp, loadBalancingIpNic.getIp4Address()); applyStaticNatRuleForInlineLBRule(zone, network, revoked, srcIp, loadBalancingIpNic.getIPv4Address());
// Delete the mapping between the source IP address and the load balancing IP address // Delete the mapping between the source IP address and the load balancing IP address
_inlineLoadBalancerNicMapDao.expunge(mapping.getId()); _inlineLoadBalancerNicMapDao.expunge(mapping.getId());
@ -914,7 +913,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase
} }
// Change the source IP address for the load balancing rule to be the load balancing IP address // Change the source IP address for the load balancing rule to be the load balancing IP address
srcIp = loadBalancingIpNic.getIp4Address(); srcIp = loadBalancingIpNic.getIPv4Address();
} }
if ((destinations != null && !destinations.isEmpty()) || rule.isAutoScaleConfig()) { if ((destinations != null && !destinations.isEmpty()) || rule.isAutoScaleConfig()) {
@ -1037,7 +1036,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase
+ " Either network implement failed half way through or already network shutdown is completed. So just returning."); + " Either network implement failed half way through or already network shutdown is completed. So just returning.");
return true; return true;
} }
selfIp = selfipNic.getIp4Address(); selfIp = selfipNic.getIPv4Address();
} }
// It's a hack, using isOneToOneNat field for indicate if it's inline or not // It's a hack, using isOneToOneNat field for indicate if it's inline or not
@ -1196,7 +1195,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase
// Change the source IP address for the load balancing rule to // Change the source IP address for the load balancing rule to
// be the load balancing IP address // be the load balancing IP address
srcIp = loadBalancingIpNic.getIp4Address(); srcIp = loadBalancingIpNic.getIPv4Address();
} }
if ((destinations != null && !destinations.isEmpty()) || !rule.isAutoScaleConfig()) { if ((destinations != null && !destinations.isEmpty()) || !rule.isAutoScaleConfig()) {
@ -1235,7 +1234,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase
for (NicVO guestIp : guestIps) { for (NicVO guestIp : guestIps) {
// only external firewall and external load balancer will create NicVO with PlaceHolder reservation strategy // only external firewall and external load balancer will create NicVO with PlaceHolder reservation strategy
if (guestIp.getReservationStrategy().equals(ReservationStrategy.PlaceHolder) && guestIp.getVmType() == null && guestIp.getReserver() == null && if (guestIp.getReservationStrategy().equals(ReservationStrategy.PlaceHolder) && guestIp.getVmType() == null && guestIp.getReserver() == null &&
!guestIp.getIp4Address().equals(network.getGateway())) { !guestIp.getIPv4Address().equals(network.getGateway())) {
return guestIp; return guestIp;
} }
} }

4
server/src/com/cloud/network/IpAddressManagerImpl.java
View File

@ -1853,9 +1853,9 @@ public class IpAddressManagerImpl extends ManagerBase implements IpAddressManage
if (requestedIpv4 != null && vm.getType() == VirtualMachine.Type.DomainRouter) { if (requestedIpv4 != null && vm.getType() == VirtualMachine.Type.DomainRouter) {
Nic placeholderNic = _networkModel.getPlaceholderNicForRouter(network, null); Nic placeholderNic = _networkModel.getPlaceholderNicForRouter(network, null);
if (placeholderNic != null) { if (placeholderNic != null) {
IPAddressVO userIp = _ipAddressDao.findByIpAndSourceNetworkId(network.getId(), placeholderNic.getIp4Address()); IPAddressVO userIp = _ipAddressDao.findByIpAndSourceNetworkId(network.getId(), placeholderNic.getIPv4Address());
ip = PublicIp.createFromAddrAndVlan(userIp, _vlanDao.findById(userIp.getVlanId())); ip = PublicIp.createFromAddrAndVlan(userIp, _vlanDao.findById(userIp.getVlanId()));
s_logger.debug("Nic got an ip address " + placeholderNic.getIp4Address() + " stored in placeholder nic for the network " + network); s_logger.debug("Nic got an ip address " + placeholderNic.getIPv4Address() + " stored in placeholder nic for the network " + network);
} }
} }

25
server/src/com/cloud/network/NetworkModelImpl.java
View File

@ -34,13 +34,11 @@ import javax.ejb.Local;
import javax.inject.Inject; import javax.inject.Inject;
import javax.naming.ConfigurationException; import javax.naming.ConfigurationException;
import com.cloud.utils.StringUtils;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
import org.apache.cloudstack.acl.ControlledEntity.ACLType; import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.lb.dao.ApplicationLoadBalancerRuleDao; import org.apache.cloudstack.lb.dao.ApplicationLoadBalancerRuleDao;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils; import com.cloud.api.ApiDBUtils;
import com.cloud.configuration.Config; import com.cloud.configuration.Config;
@ -105,6 +103,7 @@ import com.cloud.user.AccountManager;
import com.cloud.user.AccountVO; import com.cloud.user.AccountVO;
import com.cloud.user.DomainManager; import com.cloud.user.DomainManager;
import com.cloud.user.dao.AccountDao; import com.cloud.user.dao.AccountDao;
import com.cloud.utils.StringUtils;
import com.cloud.utils.component.AdapterBase; import com.cloud.utils.component.AdapterBase;
import com.cloud.utils.component.ManagerBase; import com.cloud.utils.component.ManagerBase;
import com.cloud.utils.db.DB; import com.cloud.utils.db.DB;
@ -827,15 +826,15 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
@Override @Override
public String getIpInNetwork(long vmId, long networkId) { public String getIpInNetwork(long vmId, long networkId) {
Nic guestNic = getNicInNetwork(vmId, networkId); Nic guestNic = getNicInNetwork(vmId, networkId);
assert (guestNic != null && guestNic.getIp4Address() != null) : "Vm doesn't belong to network associated with " + "ipAddress or ip4 address is null"; assert (guestNic != null && guestNic.getIPv4Address() != null) : "Vm doesn't belong to network associated with " + "ipAddress or ip4 address is null";
return guestNic.getIp4Address(); return guestNic.getIPv4Address();
} }
@Override @Override
public String getIpInNetworkIncludingRemoved(long vmId, long networkId) { public String getIpInNetworkIncludingRemoved(long vmId, long networkId) {
Nic guestNic = getNicInNetworkIncludingRemoved(vmId, networkId); Nic guestNic = getNicInNetworkIncludingRemoved(vmId, networkId);
assert (guestNic != null && guestNic.getIp4Address() != null) : "Vm doesn't belong to network associated with " + "ipAddress or ip4 address is null"; assert (guestNic != null && guestNic.getIPv4Address() != null) : "Vm doesn't belong to network associated with " + "ipAddress or ip4 address is null";
return guestNic.getIp4Address(); return guestNic.getIPv4Address();
} }
@Override @Override
@ -942,7 +941,7 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
NicVO networkElementNic = _nicDao.findByNetworkIdAndType(virtualNetwork.getId(), Type.DomainRouter); NicVO networkElementNic = _nicDao.findByNetworkIdAndType(virtualNetwork.getId(), Type.DomainRouter);
if (networkElementNic != null) { if (networkElementNic != null) {
return networkElementNic.getIp4Address(); return networkElementNic.getIPv4Address();
} else { } else {
s_logger.warn("Unable to set find network element for the network id=" + virtualNetwork.getId()); s_logger.warn("Unable to set find network element for the network id=" + virtualNetwork.getId());
return null; return null;
@ -2195,20 +2194,20 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel {
public NicVO getPlaceholderNicForRouter(Network network, Long podId) { public NicVO getPlaceholderNicForRouter(Network network, Long podId) {
List<NicVO> nics = _nicDao.listPlaceholderNicsByNetworkIdAndVmType(network.getId(), VirtualMachine.Type.DomainRouter); List<NicVO> nics = _nicDao.listPlaceholderNicsByNetworkIdAndVmType(network.getId(), VirtualMachine.Type.DomainRouter);
for (NicVO nic : nics) { for (NicVO nic : nics) {
if (nic.getReserver() == null && (nic.getIp4Address() != null || nic.getIp6Address() != null)) { if (nic.getReserver() == null && (nic.getIPv4Address() != null || nic.getIPv6Address() != null)) {
if (podId == null) { if (podId == null) {
return nic; return nic;
} else { } else {
//return nic only when its ip address belong to the pod range (for the Basic zone case) //return nic only when its ip address belong to the pod range (for the Basic zone case)
List<? extends Vlan> vlans = _vlanDao.listVlansForPod(podId); List<? extends Vlan> vlans = _vlanDao.listVlansForPod(podId);
for (Vlan vlan : vlans) { for (Vlan vlan : vlans) {
if (nic.getIp4Address() != null) { if (nic.getIPv4Address() != null) {
IpAddress ip = _ipAddressDao.findByIpAndSourceNetworkId(network.getId(), nic.getIp4Address()); IpAddress ip = _ipAddressDao.findByIpAndSourceNetworkId(network.getId(), nic.getIPv4Address());
if (ip != null && ip.getVlanId() == vlan.getId()) { if (ip != null && ip.getVlanId() == vlan.getId()) {
return nic; return nic;
} }
} else { } else {
UserIpv6AddressVO ipv6 = _ipv6Dao.findByNetworkIdAndIp(network.getId(), nic.getIp6Address()); UserIpv6AddressVO ipv6 = _ipv6Dao.findByNetworkIdAndIp(network.getId(), nic.getIPv6Address());
if (ipv6 != null && ipv6.getVlanId() == vlan.getId()) { if (ipv6 != null && ipv6.getVlanId() == vlan.getId()) {
return nic; return nic;
} }

90
server/src/com/cloud/network/NetworkServiceImpl.java
View File

@ -16,6 +16,49 @@
// under the License. // under the License.
package com.cloud.network; package com.cloud.network;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.URI;
import java.net.UnknownHostException;
import java.security.InvalidParameterException;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import java.util.UUID;
import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.command.admin.network.CreateNetworkCmdByAdmin;
import org.apache.cloudstack.api.command.admin.network.DedicateGuestVlanRangeCmd;
import org.apache.cloudstack.api.command.admin.network.ListDedicatedGuestVlanRangesCmd;
import org.apache.cloudstack.api.command.admin.usage.ListTrafficTypeImplementorsCmd;
import org.apache.cloudstack.api.command.user.network.CreateNetworkCmd;
import org.apache.cloudstack.api.command.user.network.ListNetworksCmd;
import org.apache.cloudstack.api.command.user.network.RestartNetworkCmd;
import org.apache.cloudstack.api.command.user.vm.ListNicsCmd;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.framework.messagebus.MessageBus;
import org.apache.cloudstack.framework.messagebus.PublishScope;
import org.apache.cloudstack.network.element.InternalLoadBalancerElementService;
import org.apache.log4j.Logger;
import com.cloud.api.ApiDBUtils; import com.cloud.api.ApiDBUtils;
import com.cloud.configuration.Config; import com.cloud.configuration.Config;
import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.ConfigurationManager;
@ -151,49 +194,6 @@ import com.cloud.vm.dao.NicSecondaryIpVO;
import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.UserVmDao;
import com.cloud.vm.dao.VMInstanceDao; import com.cloud.vm.dao.VMInstanceDao;
import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.command.admin.network.CreateNetworkCmdByAdmin;
import org.apache.cloudstack.api.command.admin.network.DedicateGuestVlanRangeCmd;
import org.apache.cloudstack.api.command.admin.network.ListDedicatedGuestVlanRangesCmd;
import org.apache.cloudstack.api.command.admin.usage.ListTrafficTypeImplementorsCmd;
import org.apache.cloudstack.api.command.user.network.CreateNetworkCmd;
import org.apache.cloudstack.api.command.user.network.ListNetworksCmd;
import org.apache.cloudstack.api.command.user.network.RestartNetworkCmd;
import org.apache.cloudstack.api.command.user.vm.ListNicsCmd;
import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.framework.messagebus.MessageBus;
import org.apache.cloudstack.framework.messagebus.PublishScope;
import org.apache.cloudstack.network.element.InternalLoadBalancerElementService;
import org.apache.log4j.Logger;
import javax.ejb.Local;
import javax.inject.Inject;
import javax.naming.ConfigurationException;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.URI;
import java.net.UnknownHostException;
import java.security.InvalidParameterException;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import java.util.UUID;
/** /**
* NetworkServiceImpl implements NetworkService. * NetworkServiceImpl implements NetworkService.
*/ */
@ -2185,11 +2185,11 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
s_logger.info("The specified guest vm cidr has " + range + " IPs"); s_logger.info("The specified guest vm cidr has " + range + " IPs");
for (NicVO nic : nicsPresent) { for (NicVO nic : nicsPresent) {
long nicIp = NetUtils.ip2Long(nic.getIp4Address()); long nicIp = NetUtils.ip2Long(nic.getIPv4Address());
//check if nic IP is outside the guest vm cidr //check if nic IP is outside the guest vm cidr
if (nicIp < startIp || nicIp > endIp) { if (nicIp < startIp || nicIp > endIp) {
if (!(nic.getState() == Nic.State.Deallocating)) { if (!(nic.getState() == Nic.State.Deallocating)) {
throw new InvalidParameterValueException("Active IPs like " + nic.getIp4Address() + " exist outside the Guest VM CIDR. Cannot apply reservation "); throw new InvalidParameterValueException("Active IPs like " + nic.getIPv4Address() + " exist outside the Guest VM CIDR. Cannot apply reservation ");
} }
} }
} }

8
server/src/com/cloud/network/guru/DirectNetworkGuru.java
View File

@ -294,7 +294,7 @@ public class DirectNetworkGuru extends AdapterBase implements NetworkGuru {
public void doInTransactionWithoutResult(TransactionStatus status) { public void doInTransactionWithoutResult(TransactionStatus status) {
// if the ip address a part of placeholder, don't release it // if the ip address a part of placeholder, don't release it
Nic placeholderNic = _networkModel.getPlaceholderNicForRouter(network, null); Nic placeholderNic = _networkModel.getPlaceholderNicForRouter(network, null);
if (placeholderNic != null && placeholderNic.getIp4Address().equalsIgnoreCase(ip.getAddress().addr())) { if (placeholderNic != null && placeholderNic.getIPv4Address().equalsIgnoreCase(ip.getAddress().addr())) {
s_logger.debug("Not releasing direct ip " + ip.getId() + " yet as its ip is saved in the placeholder"); s_logger.debug("Not releasing direct ip " + ip.getId() + " yet as its ip is saved in the placeholder");
} else { } else {
_ipAddrMgr.markIpAsUnavailable(ip.getId()); _ipAddrMgr.markIpAsUnavailable(ip.getId());
@ -337,9 +337,9 @@ public class DirectNetworkGuru extends AdapterBase implements NetworkGuru {
@Override @Override
public void doInTransactionWithoutResult(TransactionStatus status) { public void doInTransactionWithoutResult(TransactionStatus status) {
for (Nic nic : nics) { for (Nic nic : nics) {
if (nic.getIp4Address() != null) { if (nic.getIPv4Address() != null) {
s_logger.debug("Releasing ip " + nic.getIp4Address() + " of placeholder nic " + nic); s_logger.debug("Releasing ip " + nic.getIPv4Address() + " of placeholder nic " + nic);
IPAddressVO ip = _ipAddressDao.findByIpAndSourceNetworkId(nic.getNetworkId(), nic.getIp4Address()); IPAddressVO ip = _ipAddressDao.findByIpAndSourceNetworkId(nic.getNetworkId(), nic.getIPv4Address());
if (ip != null) { if (ip != null) {
_ipAddrMgr.markIpAsUnavailable(ip.getId()); _ipAddrMgr.markIpAsUnavailable(ip.getId());
_ipAddressDao.unassignIpAddress(ip.getId()); _ipAddressDao.unassignIpAddress(ip.getId());

4
server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java
View File

@ -182,9 +182,9 @@ public class DirectPodBasedNetworkGuru extends DirectNetworkGuru {
if (vm.getType() == VirtualMachine.Type.DomainRouter) { if (vm.getType() == VirtualMachine.Type.DomainRouter) {
Nic placeholderNic = _networkModel.getPlaceholderNicForRouter(network, pod.getId()); Nic placeholderNic = _networkModel.getPlaceholderNicForRouter(network, pod.getId());
if (placeholderNic != null) { if (placeholderNic != null) {
IPAddressVO userIp = _ipAddressDao.findByIpAndSourceNetworkId(network.getId(), placeholderNic.getIp4Address()); IPAddressVO userIp = _ipAddressDao.findByIpAndSourceNetworkId(network.getId(), placeholderNic.getIPv4Address());
ip = PublicIp.createFromAddrAndVlan(userIp, _vlanDao.findById(userIp.getVlanId())); ip = PublicIp.createFromAddrAndVlan(userIp, _vlanDao.findById(userIp.getVlanId()));
s_logger.debug("Nic got an ip address " + placeholderNic.getIp4Address() + " stored in placeholder nic for the network " + network + s_logger.debug("Nic got an ip address " + placeholderNic.getIPv4Address() + " stored in placeholder nic for the network " + network +
" and gateway " + podRangeGateway); " and gateway " + podRangeGateway);
} }
} }

4
server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java
View File

@ -190,8 +190,8 @@ public class ExternalGuestNetworkGuru extends GuestNetworkGuru {
// Mask the Ipv4 address of all nics that use this network with the new guest VLAN offset // Mask the Ipv4 address of all nics that use this network with the new guest VLAN offset
List<NicVO> nicsInNetwork = _nicDao.listByNetworkId(config.getId()); List<NicVO> nicsInNetwork = _nicDao.listByNetworkId(config.getId());
for (NicVO nic : nicsInNetwork) { for (NicVO nic : nicsInNetwork) {
if (nic.getIp4Address() != null) { if (nic.getIPv4Address() != null) {
long ipMask = getIpMask(nic.getIp4Address(), cidrSize); long ipMask = getIpMask(nic.getIPv4Address(), cidrSize);
nic.setIp4Address(NetUtils.long2Ip(newCidrAddress | ipMask)); nic.setIp4Address(NetUtils.long2Ip(newCidrAddress | ipMask));
_nicDao.persist(nic); _nicDao.persist(nic);
} }

16
server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
View File

@ -30,11 +30,6 @@ import java.util.Set;
import javax.ejb.Local; import javax.ejb.Local;
import javax.inject.Inject; import javax.inject.Inject;
import org.apache.log4j.Logger;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.command.user.loadbalancer.CreateLBHealthCheckPolicyCmd; import org.apache.cloudstack.api.command.user.loadbalancer.CreateLBHealthCheckPolicyCmd;
import org.apache.cloudstack.api.command.user.loadbalancer.CreateLBStickinessPolicyCmd; import org.apache.cloudstack.api.command.user.loadbalancer.CreateLBStickinessPolicyCmd;
@ -50,6 +45,7 @@ import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationSe
import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.lb.ApplicationLoadBalancerRuleVO; import org.apache.cloudstack.lb.ApplicationLoadBalancerRuleVO;
import org.apache.cloudstack.lb.dao.ApplicationLoadBalancerRuleDao; import org.apache.cloudstack.lb.dao.ApplicationLoadBalancerRuleDao;
import org.apache.log4j.Logger;
import com.cloud.agent.api.to.LoadBalancerTO; import com.cloud.agent.api.to.LoadBalancerTO;
import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.ConfigurationManager;
@ -169,6 +165,8 @@ import com.cloud.vm.VirtualMachine.State;
import com.cloud.vm.dao.NicDao; import com.cloud.vm.dao.NicDao;
import com.cloud.vm.dao.NicSecondaryIpDao; import com.cloud.vm.dao.NicSecondaryIpDao;
import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.UserVmDao;
import com.google.gson.Gson;
import com.google.gson.reflect.TypeToken;
@Local(value = {LoadBalancingRulesManager.class, LoadBalancingRulesService.class}) @Local(value = {LoadBalancingRulesManager.class, LoadBalancingRulesService.class})
public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements LoadBalancingRulesManager, LoadBalancingRulesService { public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements LoadBalancingRulesManager, LoadBalancingRulesService {
@ -898,7 +896,7 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
for (LoadBalancerVMMapVO lbVmMap : lbVmMaps) { for (LoadBalancerVMMapVO lbVmMap : lbVmMaps) {
UserVm vm = _vmDao.findById(lbVmMap.getInstanceId()); UserVm vm = _vmDao.findById(lbVmMap.getInstanceId());
Nic nic = _nicDao.findByInstanceIdAndNetworkIdIncludingRemoved(ulb.getNetworkId(), vm.getId()); Nic nic = _nicDao.findByInstanceIdAndNetworkIdIncludingRemoved(ulb.getNetworkId(), vm.getId());
String dstIp = lbVmMap.getInstanceIp() == null ? nic.getIp4Address(): lbVmMap.getInstanceIp(); String dstIp = lbVmMap.getInstanceIp() == null ? nic.getIPv4Address(): lbVmMap.getInstanceIp();
for (int i = 0; i < lbto.getDestinations().length; i++) { for (int i = 0; i < lbto.getDestinations().length; i++) {
LoadBalancerTO.DestinationTO des = lbto.getDestinations()[i]; LoadBalancerTO.DestinationTO des = lbto.getDestinations()[i];
@ -1031,7 +1029,7 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
throw ex; throw ex;
} }
String priIp = nicInSameNetwork.getIp4Address(); String priIp = nicInSameNetwork.getIPv4Address();
if (existingVmIdIps.containsKey(instanceId)) { if (existingVmIdIps.containsKey(instanceId)) {
// now check for ip address // now check for ip address
@ -2056,7 +2054,7 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
for (LoadBalancerVMMapVO lbVmMap : lbVmMaps) { for (LoadBalancerVMMapVO lbVmMap : lbVmMaps) {
UserVm vm = _vmDao.findById(lbVmMap.getInstanceId()); UserVm vm = _vmDao.findById(lbVmMap.getInstanceId());
Nic nic = _nicDao.findByInstanceIdAndNetworkIdIncludingRemoved(lb.getNetworkId(), vm.getId()); Nic nic = _nicDao.findByInstanceIdAndNetworkIdIncludingRemoved(lb.getNetworkId(), vm.getId());
dstIp = lbVmMap.getInstanceIp() == null ? nic.getIp4Address(): lbVmMap.getInstanceIp(); dstIp = lbVmMap.getInstanceIp() == null ? nic.getIPv4Address(): lbVmMap.getInstanceIp();
LbDestination lbDst = new LbDestination(lb.getDefaultPortStart(), lb.getDefaultPortEnd(), dstIp, lbVmMap.isRevoke()); LbDestination lbDst = new LbDestination(lb.getDefaultPortStart(), lb.getDefaultPortEnd(), dstIp, lbVmMap.isRevoke());
dstList.add(lbDst); dstList.add(lbDst);
} }
@ -2465,7 +2463,7 @@ public class LoadBalancingRulesManagerImpl<Type> extends ManagerBase implements
for (LoadBalancerVMMapVO lbVmMap : lbVmMaps) { for (LoadBalancerVMMapVO lbVmMap : lbVmMaps) {
UserVm vm = _vmDao.findById(lbVmMap.getInstanceId()); UserVm vm = _vmDao.findById(lbVmMap.getInstanceId());
Nic nic = _nicDao.findByInstanceIdAndNetworkIdIncludingRemoved(lb.getNetworkId(), vm.getId()); Nic nic = _nicDao.findByInstanceIdAndNetworkIdIncludingRemoved(lb.getNetworkId(), vm.getId());
Ip ip = new Ip(nic.getIp4Address()); Ip ip = new Ip(nic.getIPv4Address());
dstList.put(ip, vm); dstList.put(ip, vm);
} }
return dstList; return dstList;

18
server/src/com/cloud/network/router/CommandSetupHelper.java
View File

@ -191,7 +191,7 @@ public class CommandSetupHelper {
final String zoneName = _dcDao.findById(router.getDataCenterId()).getName(); final String zoneName = _dcDao.findById(router.getDataCenterId()).getName();
cmds.addCommand( cmds.addCommand(
"vmdata", "vmdata",
generateVmDataCommand(router, nic.getIp4Address(), vm.getUserData(), serviceOffering, zoneName, nic.getIp4Address(), vm.getHostName(), vm.getInstanceName(), generateVmDataCommand(router, nic.getIPv4Address(), vm.getUserData(), serviceOffering, zoneName, nic.getIPv4Address(), vm.getHostName(), vm.getInstanceName(),
vm.getId(), vm.getUuid(), publicKey, nic.getNetworkId())); vm.getId(), vm.getUuid(), publicKey, nic.getNetworkId()));
} }
@ -217,10 +217,10 @@ public class CommandSetupHelper {
} }
public void createDhcpEntryCommand(final VirtualRouter router, final UserVm vm, final NicVO nic, final Commands cmds) { public void createDhcpEntryCommand(final VirtualRouter router, final UserVm vm, final NicVO nic, final Commands cmds) {
final DhcpEntryCommand dhcpCommand = new DhcpEntryCommand(nic.getMacAddress(), nic.getIp4Address(), vm.getHostName(), nic.getIp6Address(), final DhcpEntryCommand dhcpCommand = new DhcpEntryCommand(nic.getMacAddress(), nic.getIPv4Address(), vm.getHostName(), nic.getIPv6Address(),
_networkModel.getExecuteInSeqNtwkElmtCmd()); _networkModel.getExecuteInSeqNtwkElmtCmd());
String gatewayIp = nic.getGateway(); String gatewayIp = nic.getIPv4Gateway();
if (!nic.isDefaultNic()) { if (!nic.isDefaultNic()) {
final GuestOSVO guestOS = _guestOSDao.findById(vm.getGuestOSId()); final GuestOSVO guestOS = _guestOSDao.findById(vm.getGuestOSId());
if (guestOS == null || !guestOS.getDisplayName().toLowerCase().contains("windows")) { if (guestOS == null || !guestOS.getDisplayName().toLowerCase().contains("windows")) {
@ -231,11 +231,11 @@ public class CommandSetupHelper {
final DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId()); final DataCenterVO dcVo = _dcDao.findById(router.getDataCenterId());
dhcpCommand.setDefaultRouter(gatewayIp); dhcpCommand.setDefaultRouter(gatewayIp);
dhcpCommand.setIp6Gateway(nic.getIp6Gateway()); dhcpCommand.setIp6Gateway(nic.getIPv6Gateway());
String ipaddress = null; String ipaddress = null;
final NicVO domrDefaultNic = findDefaultDnsIp(vm.getId()); final NicVO domrDefaultNic = findDefaultDnsIp(vm.getId());
if (domrDefaultNic != null) { if (domrDefaultNic != null) {
ipaddress = domrDefaultNic.getIp4Address(); ipaddress = domrDefaultNic.getIPv4Address();
} }
dhcpCommand.setDefaultDns(ipaddress); dhcpCommand.setDefaultDns(ipaddress);
dhcpCommand.setDuid(NetUtils.getDuidLL(nic.getMacAddress())); dhcpCommand.setDuid(NetUtils.getDuidLL(nic.getMacAddress()));
@ -268,13 +268,13 @@ public class CommandSetupHelper {
final List<DhcpTO> ipList = new ArrayList<DhcpTO>(); final List<DhcpTO> ipList = new ArrayList<DhcpTO>();
final NicVO router_guest_nic = _nicDao.findByNtwkIdAndInstanceId(network.getId(), router.getId()); final NicVO router_guest_nic = _nicDao.findByNtwkIdAndInstanceId(network.getId(), router.getId());
final String cidr = NetUtils.getCidrFromGatewayAndNetmask(router_guest_nic.getGateway(), router_guest_nic.getNetmask()); final String cidr = NetUtils.getCidrFromGatewayAndNetmask(router_guest_nic.getIPv4Gateway(), router_guest_nic.getIPv4Netmask());
final String[] cidrPair = cidr.split("\\/"); final String[] cidrPair = cidr.split("\\/");
final String cidrAddress = cidrPair[0]; final String cidrAddress = cidrPair[0];
final long cidrSize = Long.parseLong(cidrPair[1]); final long cidrSize = Long.parseLong(cidrPair[1]);
final String startIpOfSubnet = NetUtils.getIpRangeStartIpFromCidr(cidrAddress, cidrSize); final String startIpOfSubnet = NetUtils.getIpRangeStartIpFromCidr(cidrAddress, cidrSize);
ipList.add(new DhcpTO(router_guest_nic.getIp4Address(), router_guest_nic.getGateway(), router_guest_nic.getNetmask(), startIpOfSubnet)); ipList.add(new DhcpTO(router_guest_nic.getIPv4Address(), router_guest_nic.getIPv4Gateway(), router_guest_nic.getIPv4Netmask(), startIpOfSubnet));
for (final NicIpAliasVO ipAliasVO : ipAliasVOList) { for (final NicIpAliasVO ipAliasVO : ipAliasVOList) {
final DhcpTO DhcpTO = new DhcpTO(ipAliasVO.getIp4Address(), ipAliasVO.getGateway(), ipAliasVO.getNetmask(), ipAliasVO.getStartIpOfSubnet()); final DhcpTO DhcpTO = new DhcpTO(ipAliasVO.getIp4Address(), ipAliasVO.getGateway(), ipAliasVO.getNetmask(), ipAliasVO.getStartIpOfSubnet());
if (s_logger.isTraceEnabled()) { if (s_logger.isTraceEnabled()) {
@ -523,7 +523,7 @@ public class CommandSetupHelper {
// password should be set only on default network element // password should be set only on default network element
if (password != null && nic.isDefaultNic()) { if (password != null && nic.isDefaultNic()) {
final SavePasswordCommand cmd = new SavePasswordCommand(password, nic.getIp4Address(), profile.getVirtualMachine().getHostName(), final SavePasswordCommand cmd = new SavePasswordCommand(password, nic.getIPv4Address(), profile.getVirtualMachine().getHostName(),
_networkModel.getExecuteInSeqNtwkElmtCmd()); _networkModel.getExecuteInSeqNtwkElmtCmd());
cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, _routerControlHelper.getRouterControlIp(router.getId())); cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP, _routerControlHelper.getRouterControlIp(router.getId()));
cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, _routerControlHelper.getRouterIpInNetwork(nic.getNetworkId(), router.getId())); cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP, _routerControlHelper.getRouterIpInNetwork(nic.getNetworkId(), router.getId()));
@ -1022,7 +1022,7 @@ public class CommandSetupHelper {
// find domR's nic in the network // find domR's nic in the network
NicVO domrDefaultNic; NicVO domrDefaultNic;
if (isZoneBasic) { if (isZoneBasic) {
domrDefaultNic = _nicDao.findByNetworkIdTypeAndGateway(defaultNic.getNetworkId(), VirtualMachine.Type.DomainRouter, defaultNic.getGateway()); domrDefaultNic = _nicDao.findByNetworkIdTypeAndGateway(defaultNic.getNetworkId(), VirtualMachine.Type.DomainRouter, defaultNic.getIPv4Gateway());
} else { } else {
domrDefaultNic = _nicDao.findByNetworkIdAndType(defaultNic.getNetworkId(), VirtualMachine.Type.DomainRouter); domrDefaultNic = _nicDao.findByNetworkIdAndType(defaultNic.getNetworkId(), VirtualMachine.Type.DomainRouter);
} }

12
server/src/com/cloud/network/router/NetworkHelperImpl.java
View File

@ -679,10 +679,10 @@ public class NetworkHelperImpl implements NetworkHelper {
if (!routerDeploymentDefinition.isPublicNetwork()) { if (!routerDeploymentDefinition.isPublicNetwork()) {
final Nic placeholder = _networkModel.getPlaceholderNicForRouter(guestNetwork, routerDeploymentDefinition.getPodId()); final Nic placeholder = _networkModel.getPlaceholderNicForRouter(guestNetwork, routerDeploymentDefinition.getPodId());
if (guestNetwork.getCidr() != null) { if (guestNetwork.getCidr() != null) {
if (placeholder != null && placeholder.getIp4Address() != null) { if (placeholder != null && placeholder.getIPv4Address() != null) {
s_logger.debug("Requesting ipv4 address " + placeholder.getIp4Address() + " stored in placeholder nic for the network " s_logger.debug("Requesting ipv4 address " + placeholder.getIPv4Address() + " stored in placeholder nic for the network "
+ guestNetwork); + guestNetwork);
defaultNetworkStartIp = placeholder.getIp4Address(); defaultNetworkStartIp = placeholder.getIPv4Address();
} else { } else {
final String startIp = _networkModel.getStartIpAddress(guestNetwork.getId()); final String startIp = _networkModel.getStartIpAddress(guestNetwork.getId());
if (startIp != null if (startIp != null
@ -696,10 +696,10 @@ public class NetworkHelperImpl implements NetworkHelper {
} }
if (guestNetwork.getIp6Cidr() != null) { if (guestNetwork.getIp6Cidr() != null) {
if (placeholder != null && placeholder.getIp6Address() != null) { if (placeholder != null && placeholder.getIPv6Address() != null) {
s_logger.debug("Requesting ipv6 address " + placeholder.getIp6Address() + " stored in placeholder nic for the network " s_logger.debug("Requesting ipv6 address " + placeholder.getIPv6Address() + " stored in placeholder nic for the network "
+ guestNetwork); + guestNetwork);
defaultNetworkStartIpv6 = placeholder.getIp6Address(); defaultNetworkStartIpv6 = placeholder.getIPv6Address();
} else { } else {
final String startIpv6 = _networkModel.getStartIpv6Address(guestNetwork.getId()); final String startIpv6 = _networkModel.getStartIpv6Address(guestNetwork.getId());
if (startIpv6 != null && _ipv6Dao.findByNetworkIdAndIp(guestNetwork.getId(), startIpv6) == null) { if (startIpv6 != null && _ipv6Dao.findByNetworkIdAndIp(guestNetwork.getId(), startIpv6) == null) {

2
server/src/com/cloud/network/router/RouterControlHelper.java
View File

@ -49,7 +49,7 @@ public class RouterControlHelper {
for (final NicVO n : nics) { for (final NicVO n : nics) {
final NetworkVO nc = networkDao.findById(n.getNetworkId()); final NetworkVO nc = networkDao.findById(n.getNetworkId());
if (nc != null && nc.getTrafficType() == TrafficType.Control) { if (nc != null && nc.getTrafficType() == TrafficType.Control) {
routerControlIpAddress = n.getIp4Address(); routerControlIpAddress = n.getIPv4Address();
// router will have only one control ip // router will have only one control ip
break; break;
} }

12
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
View File

@ -769,10 +769,10 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
} }
if (forVpc && network.getTrafficType() == TrafficType.Public || !forVpc && network.getTrafficType() == TrafficType.Guest if (forVpc && network.getTrafficType() == TrafficType.Public || !forVpc && network.getTrafficType() == TrafficType.Guest
&& network.getGuestType() == Network.GuestType.Isolated) { && network.getGuestType() == Network.GuestType.Isolated) {
final NetworkUsageCommand usageCmd = new NetworkUsageCommand(privateIP, router.getHostName(), forVpc, routerNic.getIp4Address()); final NetworkUsageCommand usageCmd = new NetworkUsageCommand(privateIP, router.getHostName(), forVpc, routerNic.getIPv4Address());
final String routerType = router.getType().toString(); final String routerType = router.getType().toString();
final UserStatisticsVO previousStats = _userStatsDao.findBy(router.getAccountId(), router.getDataCenterId(), network.getId(), final UserStatisticsVO previousStats = _userStatsDao.findBy(router.getAccountId(), router.getDataCenterId(), network.getId(),
forVpc ? routerNic.getIp4Address() : null, router.getId(), routerType); forVpc ? routerNic.getIPv4Address() : null, router.getId(), routerType);
NetworkUsageAnswer answer = null; NetworkUsageAnswer answer = null;
try { try {
answer = (NetworkUsageAnswer) _agentMgr.easySend(router.getHostId(), usageCmd); answer = (NetworkUsageAnswer) _agentMgr.easySend(router.getHostId(), usageCmd);
@ -797,7 +797,7 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
@Override @Override
public void doInTransactionWithoutResult(final TransactionStatus status) { public void doInTransactionWithoutResult(final TransactionStatus status) {
final UserStatisticsVO stats = _userStatsDao.lock(router.getAccountId(), router.getDataCenterId(), network.getId(), final UserStatisticsVO stats = _userStatsDao.lock(router.getAccountId(), router.getDataCenterId(), network.getId(),
forVpc ? routerNic.getIp4Address() : null, router.getId(), routerType); forVpc ? routerNic.getIPv4Address() : null, router.getId(), routerType);
if (stats == null) { if (stats == null) {
s_logger.warn("unable to find stats for account: " + router.getAccountId()); s_logger.warn("unable to find stats for account: " + router.getAccountId());
return; return;
@ -2429,10 +2429,10 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
// VR // VR
if (forVpc && network.getTrafficType() == TrafficType.Public || !forVpc && network.getTrafficType() == TrafficType.Guest if (forVpc && network.getTrafficType() == TrafficType.Public || !forVpc && network.getTrafficType() == TrafficType.Guest
&& network.getGuestType() == Network.GuestType.Isolated) { && network.getGuestType() == Network.GuestType.Isolated) {
final NetworkUsageCommand usageCmd = new NetworkUsageCommand(privateIP, router.getHostName(), forVpc, routerNic.getIp4Address()); final NetworkUsageCommand usageCmd = new NetworkUsageCommand(privateIP, router.getHostName(), forVpc, routerNic.getIPv4Address());
final String routerType = router.getType().toString(); final String routerType = router.getType().toString();
final UserStatisticsVO previousStats = _userStatsDao.findBy(router.getAccountId(), router.getDataCenterId(), network.getId(), final UserStatisticsVO previousStats = _userStatsDao.findBy(router.getAccountId(), router.getDataCenterId(), network.getId(),
forVpc ? routerNic.getIp4Address() : null, router.getId(), routerType); forVpc ? routerNic.getIPv4Address() : null, router.getId(), routerType);
NetworkUsageAnswer answer = null; NetworkUsageAnswer answer = null;
try { try {
answer = (NetworkUsageAnswer) _agentMgr.easySend(router.getHostId(), usageCmd); answer = (NetworkUsageAnswer) _agentMgr.easySend(router.getHostId(), usageCmd);
@ -2458,7 +2458,7 @@ Configurable, StateListener<State, VirtualMachine.Event, VirtualMachine> {
@Override @Override
public void doInTransactionWithoutResult(final TransactionStatus status) { public void doInTransactionWithoutResult(final TransactionStatus status) {
final UserStatisticsVO stats = _userStatsDao.lock(router.getAccountId(), router.getDataCenterId(), network.getId(), final UserStatisticsVO stats = _userStatsDao.lock(router.getAccountId(), router.getDataCenterId(), network.getId(),
forVpc ? routerNic.getIp4Address() : null, router.getId(), routerType); forVpc ? routerNic.getIPv4Address() : null, router.getId(), routerType);
if (stats == null) { if (stats == null) {
s_logger.warn("unable to find stats for account: " + router.getAccountId()); s_logger.warn("unable to find stats for account: " + router.getAccountId());
return; return;

14
server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
View File

@ -316,7 +316,7 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
for (final Pair<Nic, Network> nicNtwk : publicNics) { for (final Pair<Nic, Network> nicNtwk : publicNics) {
final Nic publicNic = nicNtwk.first(); final Nic publicNic = nicNtwk.first();
final Network publicNtwk = nicNtwk.second(); final Network publicNtwk = nicNtwk.second();
final IPAddressVO userIp = _ipAddressDao.findByIpAndSourceNetworkId(publicNtwk.getId(), publicNic.getIp4Address()); final IPAddressVO userIp = _ipAddressDao.findByIpAndSourceNetworkId(publicNtwk.getId(), publicNic.getIPv4Address());
if (userIp.isSourceNat()) { if (userIp.isSourceNat()) {
final PublicIp publicIp = PublicIp.createFromAddrAndVlan(userIp, _vlanDao.findById(userIp.getVlanId())); final PublicIp publicIp = PublicIp.createFromAddrAndVlan(userIp, _vlanDao.findById(userIp.getVlanId()));
@ -324,8 +324,8 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
if (domainRouterVO.getPublicIpAddress() == null) { if (domainRouterVO.getPublicIpAddress() == null) {
final DomainRouterVO routerVO = _routerDao.findById(domainRouterVO.getId()); final DomainRouterVO routerVO = _routerDao.findById(domainRouterVO.getId());
routerVO.setPublicIpAddress(publicNic.getIp4Address()); routerVO.setPublicIpAddress(publicNic.getIPv4Address());
routerVO.setPublicNetmask(publicNic.getNetmask()); routerVO.setPublicNetmask(publicNic.getIPv4Netmask());
routerVO.setPublicMacAddress(publicNic.getMacAddress()); routerVO.setPublicMacAddress(publicNic.getMacAddress());
_routerDao.update(routerVO.getId(), routerVO); _routerDao.update(routerVO.getId(), routerVO);
} }
@ -334,12 +334,12 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
domainRouterVO.getInstanceName(), domainRouterVO.getType()); domainRouterVO.getInstanceName(), domainRouterVO.getType());
cmds.addCommand(plugNicCmd); cmds.addCommand(plugNicCmd);
final VpcVO vpc = _vpcDao.findById(domainRouterVO.getVpcId()); final VpcVO vpc = _vpcDao.findById(domainRouterVO.getVpcId());
final NetworkUsageCommand netUsageCmd = new NetworkUsageCommand(domainRouterVO.getPrivateIpAddress(), domainRouterVO.getInstanceName(), true, publicNic.getIp4Address(), vpc.getCidr()); final NetworkUsageCommand netUsageCmd = new NetworkUsageCommand(domainRouterVO.getPrivateIpAddress(), domainRouterVO.getInstanceName(), true, publicNic.getIPv4Address(), vpc.getCidr());
usageCmds.add(netUsageCmd); usageCmds.add(netUsageCmd);
UserStatisticsVO stats = _userStatsDao.findBy(domainRouterVO.getAccountId(), domainRouterVO.getDataCenterId(), publicNtwk.getId(), publicNic.getIp4Address(), domainRouterVO.getId(), UserStatisticsVO stats = _userStatsDao.findBy(domainRouterVO.getAccountId(), domainRouterVO.getDataCenterId(), publicNtwk.getId(), publicNic.getIPv4Address(), domainRouterVO.getId(),
domainRouterVO.getType().toString()); domainRouterVO.getType().toString());
if (stats == null) { if (stats == null) {
stats = new UserStatisticsVO(domainRouterVO.getAccountId(), domainRouterVO.getDataCenterId(), publicNic.getIp4Address(), domainRouterVO.getId(), domainRouterVO.getType().toString(), stats = new UserStatisticsVO(domainRouterVO.getAccountId(), domainRouterVO.getDataCenterId(), publicNic.getIPv4Address(), domainRouterVO.getId(), domainRouterVO.getType().toString(),
publicNtwk.getId()); publicNtwk.getId());
_userStatsDao.persist(stats); _userStatsDao.persist(stats);
} }
@ -365,7 +365,7 @@ public class VpcVirtualNetworkApplianceManagerImpl extends VirtualNetworkApplian
} else { } else {
// set private network // set private network
final PrivateIpVO ipVO = _privateIpDao.findByIpAndSourceNetworkId(guestNic.getNetworkId(), guestNic.getIp4Address()); final PrivateIpVO ipVO = _privateIpDao.findByIpAndSourceNetworkId(guestNic.getNetworkId(), guestNic.getIPv4Address());
final Network network = _networkDao.findById(guestNic.getNetworkId()); final Network network = _networkDao.findById(guestNic.getNetworkId());
BroadcastDomainType.getValue(network.getBroadcastUri()); BroadcastDomainType.getValue(network.getBroadcastUri());
final String netmask = NetUtils.getCidrNetmask(network.getCidr()); final String netmask = NetUtils.getCidrNetmask(network.getCidr());

2
server/src/com/cloud/network/rules/DhcpSubNetRules.java
View File

@ -92,7 +92,7 @@ public class DhcpSubNetRules extends RuleApplier {
// create one. // create one.
// This should happen only in case of Basic and Advanced SG enabled // This should happen only in case of Basic and Advanced SG enabled
// networks. // networks.
if (!NetUtils.sameSubnet(domrGuestNic.getIp4Address(), _nic.getIPv4Address(), _nic.getIPv4Netmask())) { if (!NetUtils.sameSubnet(domrGuestNic.getIPv4Address(), _nic.getIPv4Address(), _nic.getIPv4Netmask())) {
final NicIpAliasDao nicIpAliasDao = visitor.getVirtualNetworkApplianceFactory().getNicIpAliasDao(); final NicIpAliasDao nicIpAliasDao = visitor.getVirtualNetworkApplianceFactory().getNicIpAliasDao();
final List<NicIpAliasVO> aliasIps = nicIpAliasDao.listByNetworkIdAndState(domrGuestNic.getNetworkId(), NicIpAlias.state.active); final List<NicIpAliasVO> aliasIps = nicIpAliasDao.listByNetworkIdAndState(domrGuestNic.getNetworkId(), NicIpAlias.state.active);
boolean ipInVmsubnet = false; boolean ipInVmsubnet = false;

17
server/src/com/cloud/network/rules/RulesManagerImpl.java
View File

@ -25,11 +25,10 @@ import java.util.Set;
import javax.ejb.Local; import javax.ejb.Local;
import javax.inject.Inject; import javax.inject.Inject;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.command.user.firewall.ListPortForwardingRulesCmd; import org.apache.cloudstack.api.command.user.firewall.ListPortForwardingRulesCmd;
import org.apache.cloudstack.context.CallContext; import org.apache.cloudstack.context.CallContext;
import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService; import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationService;
import org.apache.log4j.Logger;
import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.ConfigurationManager;
import com.cloud.domain.dao.DomainDao; import com.cloud.domain.dao.DomainDao;
@ -275,10 +274,10 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules
// Verify that vm has nic in the network // Verify that vm has nic in the network
Ip dstIp = rule.getDestinationIpAddress(); Ip dstIp = rule.getDestinationIpAddress();
guestNic = _networkModel.getNicInNetwork(vmId, networkId); guestNic = _networkModel.getNicInNetwork(vmId, networkId);
if (guestNic == null || guestNic.getIp4Address() == null) { if (guestNic == null || guestNic.getIPv4Address() == null) {
throw new InvalidParameterValueException("Vm doesn't belong to network associated with ipAddress"); throw new InvalidParameterValueException("Vm doesn't belong to network associated with ipAddress");
} else { } else {
dstIp = new Ip(guestNic.getIp4Address()); dstIp = new Ip(guestNic.getIPv4Address());
} }
if (vmIp != null) { if (vmIp != null) {
@ -482,7 +481,7 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules
if (guestNic == null) { if (guestNic == null) {
throw new InvalidParameterValueException("Vm doesn't belong to the network with specified id"); throw new InvalidParameterValueException("Vm doesn't belong to the network with specified id");
} }
dstIp = guestNic.getIp4Address(); dstIp = guestNic.getIPv4Address();
if (!_networkModel.areServicesSupportedInNetwork(network.getId(), Service.StaticNat)) { if (!_networkModel.areServicesSupportedInNetwork(network.getId(), Service.StaticNat)) {
throw new InvalidParameterValueException("Unable to create static nat rule; StaticNat service is not " + "supported in network with specified id"); throw new InvalidParameterValueException("Unable to create static nat rule; StaticNat service is not " + "supported in network with specified id");
@ -1479,7 +1478,7 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules
s_logger.debug("Checking if PF/StaticNat/LoadBalancer rules are configured for nic " + nic.getId()); s_logger.debug("Checking if PF/StaticNat/LoadBalancer rules are configured for nic " + nic.getId());
List<FirewallRuleVO> result = new ArrayList<FirewallRuleVO>(); List<FirewallRuleVO> result = new ArrayList<FirewallRuleVO>();
// add PF rules // add PF rules
result.addAll(_portForwardingDao.listByNetworkAndDestIpAddr(nic.getIp4Address(), nic.getNetworkId())); result.addAll(_portForwardingDao.listByNetworkAndDestIpAddr(nic.getIPv4Address(), nic.getNetworkId()));
if(result.size() > 0) { if(result.size() > 0) {
s_logger.debug("Found " + result.size() + " portforwarding rule configured for the nic in the network " + nic.getNetworkId()); s_logger.debug("Found " + result.size() + " portforwarding rule configured for the nic in the network " + nic.getNetworkId());
} }
@ -1493,7 +1492,7 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules
} }
List<? extends IpAddress> staticNatIps = _ipAddressDao.listStaticNatPublicIps(nic.getNetworkId()); List<? extends IpAddress> staticNatIps = _ipAddressDao.listStaticNatPublicIps(nic.getNetworkId());
for (IpAddress ip : staticNatIps) { for (IpAddress ip : staticNatIps) {
if (ip.getVmIp() != null && ip.getVmIp().equals(nic.getIp4Address())) { if (ip.getVmIp() != null && ip.getVmIp().equals(nic.getIPv4Address())) {
VMInstanceVO vm = _vmInstanceDao.findById(nic.getInstanceId()); VMInstanceVO vm = _vmInstanceDao.findById(nic.getInstanceId());
// generate a static Nat rule on the fly because staticNATrule does not persist into db anymore // generate a static Nat rule on the fly because staticNATrule does not persist into db anymore
// FIX ME // FIX ME
@ -1544,10 +1543,10 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules
if (virtualMachineId != null) { if (virtualMachineId != null) {
// Verify that vm has nic in the network // Verify that vm has nic in the network
Nic guestNic = _networkModel.getNicInNetwork(virtualMachineId, rule.getNetworkId()); Nic guestNic = _networkModel.getNicInNetwork(virtualMachineId, rule.getNetworkId());
if (guestNic == null || guestNic.getIp4Address() == null) { if (guestNic == null || guestNic.getIPv4Address() == null) {
throw new InvalidParameterValueException("Vm doesn't belong to network associated with ipAddress"); throw new InvalidParameterValueException("Vm doesn't belong to network associated with ipAddress");
} else { } else {
dstIp = new Ip(guestNic.getIp4Address()); dstIp = new Ip(guestNic.getIPv4Address());
} }
if (vmGuestIp != null) { if (vmGuestIp != null) {

7
server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
View File

@ -40,9 +40,6 @@ import javax.ejb.Local;
import javax.inject.Inject; import javax.inject.Inject;
import javax.naming.ConfigurationException; import javax.naming.ConfigurationException;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.log4j.Logger;
import org.apache.cloudstack.acl.SecurityChecker.AccessType; import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupEgressCmd; import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupEgressCmd;
import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupIngressCmd; import org.apache.cloudstack.api.command.user.securitygroup.AuthorizeSecurityGroupIngressCmd;
@ -55,6 +52,8 @@ import org.apache.cloudstack.engine.orchestration.service.NetworkOrchestrationSe
import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
import org.apache.cloudstack.managed.context.ManagedContextRunnable; import org.apache.cloudstack.managed.context.ManagedContextRunnable;
import org.apache.cloudstack.utils.identity.ManagementServerNode; import org.apache.cloudstack.utils.identity.ManagementServerNode;
import org.apache.commons.codec.digest.DigestUtils;
import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager; import com.cloud.agent.AgentManager;
import com.cloud.agent.api.NetworkRulesSystemVmCommand; import com.cloud.agent.api.NetworkRulesSystemVmCommand;
@ -351,7 +350,7 @@ public class SecurityGroupManagerImpl extends ManagerBase implements SecurityGro
for (SecurityGroupVMMapVO ngmapVO : allowedInstances) { for (SecurityGroupVMMapVO ngmapVO : allowedInstances) {
Nic defaultNic = _networkModel.getDefaultNic(ngmapVO.getInstanceId()); Nic defaultNic = _networkModel.getDefaultNic(ngmapVO.getInstanceId());
if (defaultNic != null) { if (defaultNic != null) {
String cidr = defaultNic.getIp4Address(); String cidr = defaultNic.getIPv4Address();
cidr = cidr + "/32"; cidr = cidr + "/32";
cidrs.add(cidr); cidrs.add(cidr);
} }

28
server/src/com/cloud/vm/UserVmManagerImpl.java
View File

@ -28,20 +28,15 @@ import java.util.Map.Entry;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import javax.ejb.Local; import javax.ejb.Local;
import javax.inject.Inject; import javax.inject.Inject;
import javax.naming.ConfigurationException; import javax.naming.ConfigurationException;
import com.cloud.event.ActionEvent;
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
import org.apache.cloudstack.acl.ControlledEntity.ACLType; import org.apache.cloudstack.acl.ControlledEntity.ACLType;
import org.apache.cloudstack.acl.SecurityChecker.AccessType; import org.apache.cloudstack.acl.SecurityChecker.AccessType;
import org.apache.cloudstack.affinity.AffinityGroupService; import org.apache.cloudstack.affinity.AffinityGroupService;
@ -91,16 +86,20 @@ import org.apache.cloudstack.storage.command.DeleteCommand;
import org.apache.cloudstack.storage.command.DettachCommand; import org.apache.cloudstack.storage.command.DettachCommand;
import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreDao;
import org.apache.cloudstack.storage.datastore.db.TemplateDataStoreVO;
import org.apache.commons.codec.binary.Base64;
import org.apache.log4j.Logger;
import com.cloud.agent.AgentManager; import com.cloud.agent.AgentManager;
import com.cloud.agent.api.Answer; import com.cloud.agent.api.Answer;
import com.cloud.agent.api.Command; import com.cloud.agent.api.Command;
import com.cloud.agent.api.GetVmDiskStatsAnswer; import com.cloud.agent.api.GetVmDiskStatsAnswer;
import com.cloud.agent.api.GetVmDiskStatsCommand; import com.cloud.agent.api.GetVmDiskStatsCommand;
import com.cloud.agent.api.GetVmIpAddressCommand;
import com.cloud.agent.api.GetVmStatsAnswer; import com.cloud.agent.api.GetVmStatsAnswer;
import com.cloud.agent.api.GetVmStatsCommand; import com.cloud.agent.api.GetVmStatsCommand;
import com.cloud.agent.api.PvlanSetupCommand; import com.cloud.agent.api.PvlanSetupCommand;
import com.cloud.agent.api.GetVmIpAddressCommand;
import com.cloud.agent.api.StartAnswer; import com.cloud.agent.api.StartAnswer;
import com.cloud.agent.api.VmDiskStatsEntry; import com.cloud.agent.api.VmDiskStatsEntry;
import com.cloud.agent.api.VmStatsEntry; import com.cloud.agent.api.VmStatsEntry;
@ -132,11 +131,12 @@ import com.cloud.deploy.DeploymentPlanner.ExcludeList;
import com.cloud.deploy.DeploymentPlanningManager; import com.cloud.deploy.DeploymentPlanningManager;
import com.cloud.deploy.PlannerHostReservationVO; import com.cloud.deploy.PlannerHostReservationVO;
import com.cloud.deploy.dao.PlannerHostReservationDao; import com.cloud.deploy.dao.PlannerHostReservationDao;
import com.cloud.domain.DomainVO;
import com.cloud.domain.Domain; import com.cloud.domain.Domain;
import com.cloud.domain.DomainVO;
import com.cloud.domain.dao.DomainDao; import com.cloud.domain.dao.DomainDao;
import com.cloud.event.EventTypes; import com.cloud.event.ActionEvent;
import com.cloud.event.ActionEventUtils; import com.cloud.event.ActionEventUtils;
import com.cloud.event.EventTypes;
import com.cloud.event.UsageEventUtils; import com.cloud.event.UsageEventUtils;
import com.cloud.event.UsageEventVO; import com.cloud.event.UsageEventVO;
import com.cloud.event.dao.UsageEventDao; import com.cloud.event.dao.UsageEventDao;
@ -631,7 +631,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
} else { } else {
//previously vm has ip and nic table has ip address. After vm restart or stop/start //previously vm has ip and nic table has ip address. After vm restart or stop/start
//if vm doesnot get the ip then set the ip in nic table to null //if vm doesnot get the ip then set the ip in nic table to null
if (nic.getIp4Address() != null) { if (nic.getIPv4Address() != null) {
nic.setIp4Address(null); nic.setIp4Address(null);
_nicDao.update(nicId, nic); _nicDao.update(nicId, nic);
} }
@ -1868,7 +1868,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
for (NicVO nic : nics) { for (NicVO nic : nics) {
if (nic.getIp4Address() == null) { if (nic.getIPv4Address() == null) {
long nicId = nic.getId(); long nicId = nic.getId();
long vmId = nic.getInstanceId(); long vmId = nic.getInstanceId();
VMInstanceVO vmInstance = _vmInstanceDao.findById(vmId); VMInstanceVO vmInstance = _vmInstanceDao.findById(vmId);
@ -3572,7 +3572,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
for (NicVO nic : nics) { for (NicVO nic : nics) {
NetworkVO network = _networkDao.findById(nic.getNetworkId()); NetworkVO network = _networkDao.findById(nic.getNetworkId());
if (network.getTrafficType() == TrafficType.Guest || network.getTrafficType() == TrafficType.Public) { if (network.getTrafficType() == TrafficType.Guest || network.getTrafficType() == TrafficType.Public) {
userVm.setPrivateIpAddress(nic.getIp4Address()); userVm.setPrivateIpAddress(nic.getIPv4Address());
userVm.setPrivateMacAddress(nic.getMacAddress()); userVm.setPrivateMacAddress(nic.getMacAddress());
_vmDao.update(userVm.getId(), userVm); _vmDao.update(userVm.getId(), userVm);
} }
@ -3629,7 +3629,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_ASSIGN, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), Long.toString(nic.getId()), UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_ASSIGN, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), Long.toString(nic.getId()),
network.getNetworkOfferingId(), null, isDefault, VirtualMachine.class.getName(), vm.getUuid(), vm.isDisplay()); network.getNetworkOfferingId(), null, isDefault, VirtualMachine.class.getName(), vm.getUuid(), vm.isDisplay());
if (network.getTrafficType() == TrafficType.Guest) { if (network.getTrafficType() == TrafficType.Guest) {
originalIp = nic.getIp4Address(); originalIp = nic.getIPv4Address();
guestNic = nic; guestNic = nic;
guestNetwork = network; guestNetwork = network;
// In vmware, we will be effecting pvlan settings in portgroups in StartCommand. // In vmware, we will be effecting pvlan settings in portgroups in StartCommand.
@ -3662,7 +3662,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Vir
// dc.getDhcpProvider().equalsIgnoreCase(Provider.ExternalDhcpServer.getName()) // dc.getDhcpProvider().equalsIgnoreCase(Provider.ExternalDhcpServer.getName())
if (_ntwkSrvcDao.canProviderSupportServiceInNetwork(guestNetwork.getId(), Service.Dhcp, Provider.ExternalDhcpServer)) { if (_ntwkSrvcDao.canProviderSupportServiceInNetwork(guestNetwork.getId(), Service.Dhcp, Provider.ExternalDhcpServer)) {
_nicDao.update(guestNic.getId(), guestNic); _nicDao.update(guestNic.getId(), guestNic);
userVm.setPrivateIpAddress(guestNic.getIp4Address()); userVm.setPrivateIpAddress(guestNic.getIPv4Address());
_vmDao.update(userVm.getId(), userVm); _vmDao.update(userVm.getId(), userVm);
s_logger.info("Detected that ip changed in the answer, updated nic in the db with new ip " + returnedIp); s_logger.info("Detected that ip changed in the answer, updated nic in the db with new ip " + returnedIp);

6
server/test/com/cloud/network/router/RouterControlHelperTest.java
View File

@ -68,9 +68,9 @@ public class RouterControlHelperTest {
NicVO nic3 = mock(NicVO.class); NicVO nic3 = mock(NicVO.class);
when(nic1.getNetworkId()).thenReturn(NW_ID_1); when(nic1.getNetworkId()).thenReturn(NW_ID_1);
when(nic2.getNetworkId()).thenReturn(NW_ID_2); when(nic2.getNetworkId()).thenReturn(NW_ID_2);
when(nic2.getIp4Address()).thenReturn(IP4_ADDRES1); when(nic2.getIPv4Address()).thenReturn(IP4_ADDRES1);
when(nic3.getNetworkId()).thenReturn(NW_ID_3); when(nic3.getNetworkId()).thenReturn(NW_ID_3);
when(nic3.getIp4Address()).thenReturn(IP4_ADDRES2); when(nic3.getIPv4Address()).thenReturn(IP4_ADDRES2);
nics.add(nic1); nics.add(nic1);
nics.add(nic2); nics.add(nic2);
nics.add(nic3); nics.add(nic3);
@ -99,7 +99,7 @@ public class RouterControlHelperTest {
List<NicVO> nics = new ArrayList<>(); List<NicVO> nics = new ArrayList<>();
NicVO nic1 = mock(NicVO.class); NicVO nic1 = mock(NicVO.class);
when(nic1.getNetworkId()).thenReturn(NW_ID_1); when(nic1.getNetworkId()).thenReturn(NW_ID_1);
when(nic1.getIp4Address()).thenReturn(null); when(nic1.getIPv4Address()).thenReturn(null);
nics.add(nic1); nics.add(nic1);
when(this.nicDao.listByVmId(ROUTER_ID)).thenReturn(nics); when(this.nicDao.listByVmId(ROUTER_ID)).thenReturn(nics);