Skip to content

Commit cf1428d

Browse files
FelipeM525FelipeM525
authored
Fix column from op_dc_ip_address_alloc not being referenced correctly by its ORM class (#8812)
* refactored field instanceId to nicId in DataCenterIpAddressVO and AcquirePodIpCmdResponse * refactored ocurrences of "instanceId" in DataCenterDaoImpl and DataCenterIpAddressDaoImpl
1 parent b429e84 commit cf1428d

File tree

6 files changed

+34
-34
lines changed

6 files changed

+34
-34
lines changed

‎api/src/main/java/org/apache/cloudstack/api/response/AcquirePodIpCmdResponse.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class AcquirePodIpCmdResponse extends BaseResponse {
4444

4545
@SerializedName(ApiConstants.NIC_ID)
4646
@Param(description = "the ID of the nic")
47-
private Long instanceId;
47+
private Long nicId;
4848

4949
@SerializedName(ApiConstants.HOST_MAC)
5050
@Param(description = "MAC address of the pod the IP")
@@ -58,8 +58,8 @@ public void setIpAddress(String ipAddress) {
5858
this.ipAddress = ipAddress;
5959
}
6060

61-
public void setInstanceId(Long instanceId) {
62-
this.instanceId = instanceId;
61+
public void setNicId(Long nicId) {
62+
this.nicId = nicId;
6363
}
6464

6565
public void setPodId(long podId) {
@@ -82,8 +82,8 @@ public long getId() {
8282
return id;
8383
}
8484

85-
public Long getInstanceId() {
86-
return instanceId;
85+
public Long getNicId() {
86+
return nicId;
8787
}
8888

8989
public long getPodId() {

‎engine/schema/src/main/java/com/cloud/dc/DataCenterIpAddressVO.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public class DataCenterIpAddressVO implements InternalIdentity {
5555
String reservationId;
5656

5757
@Column(name = "nic_id")
58-
private Long instanceId;
58+
private Long nicId;
5959

6060
@Column(name = "mac_address")
6161
long macAddress;
@@ -88,12 +88,12 @@ public long getId() {
8888
return id;
8989
}
9090

91-
public Long getInstanceId() {
92-
return instanceId;
91+
public Long getNicId() {
92+
return nicId;
9393
}
9494

95-
public void setInstanceId(Long instanceId) {
96-
this.instanceId = instanceId;
95+
public void setNicId(Long nicId) {
96+
this.nicId = nicId;
9797
}
9898

9999
public long getPodId() {

‎engine/schema/src/main/java/com/cloud/dc/dao/DataCenterDaoImpl.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ public int countZoneVlans(long dcId, boolean onlyCountAllocated) {
164164
}
165165

166166
@Override
167-
public void releasePrivateIpAddress(String ipAddress, long dcId, Long instanceId) {
168-
_ipAllocDao.releaseIpAddress(ipAddress, dcId, instanceId);
167+
public void releasePrivateIpAddress(String ipAddress, long dcId, Long nicId) {
168+
_ipAllocDao.releaseIpAddress(ipAddress, dcId, nicId);
169169
}
170170

171171
@Override
@@ -179,8 +179,8 @@ public void releaseLinkLocalIpAddress(long nicId, String reservationId) {
179179
}
180180

181181
@Override
182-
public void releaseLinkLocalIpAddress(String ipAddress, long dcId, Long instanceId) {
183-
_linkLocalIpAllocDao.releaseIpAddress(ipAddress, dcId, instanceId);
182+
public void releaseLinkLocalIpAddress(String ipAddress, long dcId, Long nicId) {
183+
_linkLocalIpAllocDao.releaseIpAddress(ipAddress, dcId, nicId);
184184
}
185185

186186
@Override
@@ -226,9 +226,9 @@ public String allocatePodVlan(long podId, long accountId) {
226226
}
227227

228228
@Override
229-
public PrivateAllocationData allocatePrivateIpAddress(long dcId, long podId, long instanceId, String reservationId, boolean forSystemVms) {
230-
_ipAllocDao.releaseIpAddress(instanceId);
231-
DataCenterIpAddressVO vo = _ipAllocDao.takeIpAddress(dcId, podId, instanceId, reservationId, forSystemVms);
229+
public PrivateAllocationData allocatePrivateIpAddress(long dcId, long podId, long nicId, String reservationId, boolean forSystemVms) {
230+
_ipAllocDao.releaseIpAddress(nicId);
231+
DataCenterIpAddressVO vo = _ipAllocDao.takeIpAddress(dcId, podId, nicId, reservationId, forSystemVms);
232232
if (vo == null) {
233233
return null;
234234
}
@@ -242,8 +242,8 @@ public DataCenterIpAddressVO allocatePrivateIpAddress(long dcId, String reservat
242242
}
243243

244244
@Override
245-
public String allocateLinkLocalIpAddress(long dcId, long podId, long instanceId, String reservationId) {
246-
DataCenterLinkLocalIpAddressVO vo = _linkLocalIpAllocDao.takeIpAddress(dcId, podId, instanceId, reservationId);
245+
public String allocateLinkLocalIpAddress(long dcId, long podId, long nicId, String reservationId) {
246+
DataCenterLinkLocalIpAddressVO vo = _linkLocalIpAllocDao.takeIpAddress(dcId, podId, nicId, reservationId);
247247
if (vo == null) {
248248
return null;
249249
}

‎engine/schema/src/main/java/com/cloud/dc/dao/DataCenterIpAddressDaoImpl.java‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public class DataCenterIpAddressDaoImpl extends GenericDaoBase<DataCenterIpAddre
5151

5252
@Override
5353
@DB
54-
public DataCenterIpAddressVO takeIpAddress(long dcId, long podId, long instanceId, String reservationId, boolean forSystemVms) {
54+
public DataCenterIpAddressVO takeIpAddress(long dcId, long podId, long nicId, String reservationId, boolean forSystemVms) {
5555
SearchCriteria<DataCenterIpAddressVO> sc = AllFieldsSearch.create();
5656
sc.setParameters("pod", podId);
5757
sc.setParameters("taken", (Date)null);
@@ -71,7 +71,7 @@ public DataCenterIpAddressVO takeIpAddress(long dcId, long podId, long instanceI
7171
return null;
7272
}
7373
vo.setTakenAt(new Date());
74-
vo.setInstanceId(instanceId);
74+
vo.setNicId(nicId);
7575
vo.setReservationId(reservationId);
7676
update(vo.getId(), vo);
7777
txn.commit();
@@ -166,35 +166,35 @@ public void addIpRange(long dcId, long podId, String start, String end, boolean
166166
}
167167

168168
@Override
169-
public void releaseIpAddress(String ipAddress, long dcId, Long instanceId) {
169+
public void releaseIpAddress(String ipAddress, long dcId, Long nicId) {
170170
if (logger.isDebugEnabled()) {
171171
logger.debug("Releasing ip address: " + ipAddress + " data center " + dcId);
172172
}
173173
SearchCriteria<DataCenterIpAddressVO> sc = AllFieldsSearch.create();
174174
sc.setParameters("ip", ipAddress);
175175
sc.setParameters("dc", dcId);
176-
sc.setParameters("instance", instanceId);
176+
sc.setParameters("nic", nicId);
177177

178178
DataCenterIpAddressVO vo = createForUpdate();
179179

180180
vo.setTakenAt(null);
181-
vo.setInstanceId(null);
181+
vo.setNicId(null);
182182
vo.setReservationId(null);
183183
update(vo, sc);
184184
}
185185

186186
@Override
187187
public void releaseIpAddress(long nicId, String reservationId) {
188188
if (logger.isDebugEnabled()) {
189-
logger.debug("Releasing ip address for reservationId=" + reservationId + ", instance=" + nicId);
189+
logger.debug("Releasing ip address for reservationId=" + reservationId + ", nic=" + nicId);
190190
}
191191
SearchCriteria<DataCenterIpAddressVO> sc = AllFieldsSearch.create();
192-
sc.setParameters("instance", nicId);
192+
sc.setParameters("nic", nicId);
193193
sc.setParameters("reservation", reservationId);
194194

195195
DataCenterIpAddressVO vo = createForUpdate();
196196
vo.setTakenAt(null);
197-
vo.setInstanceId(null);
197+
vo.setNicId(null);
198198
vo.setReservationId(null);
199199
update(vo, sc);
200200
}
@@ -207,22 +207,22 @@ public void releasePodIpAddress(long id) {
207207

208208
DataCenterIpAddressVO vo = this.findById(id);
209209
vo.setTakenAt(null);
210-
vo.setInstanceId(null);
210+
vo.setNicId(null);
211211
vo.setReservationId(null);
212212
persist(vo);
213213
}
214214

215215
@Override
216216
public void releaseIpAddress(long nicId) {
217217
if (logger.isDebugEnabled()) {
218-
logger.debug("Releasing ip address for instance=" + nicId);
218+
logger.debug("Releasing ip address for nic=" + nicId);
219219
}
220220
SearchCriteria<DataCenterIpAddressVO> sc = AllFieldsSearch.create();
221-
sc.setParameters("instance", nicId);
221+
sc.setParameters("nic", nicId);
222222

223223
DataCenterIpAddressVO vo = createForUpdate();
224224
vo.setTakenAt(null);
225-
vo.setInstanceId(null);
225+
vo.setNicId(null);
226226
vo.setReservationId(null);
227227
update(vo, sc);
228228
}
@@ -305,7 +305,7 @@ public DataCenterIpAddressDaoImpl() {
305305
AllFieldsSearch.and("ip", AllFieldsSearch.entity().getIpAddress(), SearchCriteria.Op.EQ);
306306
AllFieldsSearch.and("dc", AllFieldsSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ);
307307
AllFieldsSearch.and("pod", AllFieldsSearch.entity().getPodId(), SearchCriteria.Op.EQ);
308-
AllFieldsSearch.and("instance", AllFieldsSearch.entity().getInstanceId(), SearchCriteria.Op.EQ);
308+
AllFieldsSearch.and("nic", AllFieldsSearch.entity().getNicId(), SearchCriteria.Op.EQ);
309309
AllFieldsSearch.and("ipAddress", AllFieldsSearch.entity().getIpAddress(), SearchCriteria.Op.EQ);
310310
AllFieldsSearch.and("reservation", AllFieldsSearch.entity().getReservationId(), SearchCriteria.Op.EQ);
311311
AllFieldsSearch.and("taken", AllFieldsSearch.entity().getTakenAt(), SearchCriteria.Op.EQ);

‎server/src/main/java/com/cloud/network/IpAddressManagerImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1261,7 +1261,7 @@ public AcquirePodIpCmdResponse allocatePodIp(String zoneId, String podId) throws
12611261
AcquirePodIpCmdResponse ret = new AcquirePodIpCmdResponse();
12621262
ret.setCidrAddress(pod_vo.getCidrAddress());
12631263
ret.setGateway(pod_vo.getGateway());
1264-
ret.setInstanceId(vo.getInstanceId());
1264+
ret.setNicId(vo.getNicId());
12651265
ret.setIpAddress(vo.getIpAddress());
12661266
ret.setMacAddress(vo.getMacAddress());
12671267
ret.setPodId(vo.getPodId());

‎server/src/main/java/com/cloud/resource/ResourceManagerImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2716,7 +2716,7 @@ private void checkIPConflicts(final HostPodVO pod, final DataCenterVO dc, final
27162716
}
27172717
if (existingPrivateIPs.size() == 1) {
27182718
final DataCenterIpAddressVO vo = existingPrivateIPs.get(0);
2719-
if (vo.getInstanceId() != null) {
2719+
if (vo.getNicId() != null) {
27202720
throw new IllegalArgumentException("The private ip address of the server (" + serverPrivateIP + ") is already in use in pod: " + pod.getName() +
27212721
" and zone: " + dc.getName());
27222722
}

0 commit comments

Comments
 (0)