Skip to content

Commit d800487

Browse files
yadvryadvr
committed
Merge remote-tracking branch 'origin/4.16' into main
2 parents b4aabad + babf94f commit d800487

95 files changed

Lines changed: 184 additions & 123 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎api/src/main/java/com/cloud/vm/NicProfile.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public long getNetworkId() {
147147
return networkId;
148148
}
149149

150-
public void setNetworId(long networkId){
150+
public void setNetworkId(long networkId){
151151
this.networkId = networkId;
152152
}
153153

‎engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2052,7 +2052,6 @@ public void prepareAllNicsForMigration(final VirtualMachineProfile vm, final Dep
20522052
//Create nic profile for migration
20532053
s_logger.debug("Creating nic profile for migration. BroadcastUri: "+broadcastUri.toString()+" NetworkId: "+ntwkId+" Vm: "+vm.getId());
20542054
final NetworkVO network = _networksDao.findById(ntwkId);
2055-
_networkModel.getNetworkRate(network.getId(), vm.getId());
20562055
final NetworkGuru guru = AdapterBase.getAdapterByName(networkGurus, network.getGuruName());
20572056
final NicProfile profile = new NicProfile();
20582057
profile.setDeviceId(255); //dummyId
@@ -2066,7 +2065,8 @@ public void prepareAllNicsForMigration(final VirtualMachineProfile vm, final Dep
20662065
profile.setIsolationUri(Networks.IsolationType.Vlan.toUri(publicIp.getVlanTag()));
20672066
profile.setSecurityGroupEnabled(_networkModel.isSecurityGroupSupportedInNetwork(network));
20682067
profile.setName(_networkModel.getNetworkTag(vm.getHypervisorType(), network));
2069-
profile.setNetworId(network.getId());
2068+
profile.setNetworkRate(_networkModel.getNetworkRate(network.getId(), vm.getId()));
2069+
profile.setNetworkId(network.getId());
20702070

20712071
guru.updateNicProfile(profile, network);
20722072
vm.addNic(profile);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ public interface Ipv6AddressManager extends Manager {
3131

3232
public String acquireGuestIpv6Address(Network network, String requestedIpv6) throws InsufficientAddressCapacityException;
3333

34-
public void setNicIp6Address(final NicProfile nic, final DataCenter dc, final Network network);
34+
public void setNicIp6Address(final NicProfile nic, final DataCenter dc, final Network network) throws InsufficientAddressCapacityException;
3535

3636
}

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,13 +195,15 @@ protected boolean isIp6Taken(Network network, String requestedIpv6) {
195195
* address information.
196196
*/
197197
@Override
198-
public void setNicIp6Address(final NicProfile nic, final DataCenter dc, final Network network) {
198+
public void setNicIp6Address(final NicProfile nic, final DataCenter dc, final Network network) throws InsufficientAddressCapacityException {
199199
if (network.getIp6Gateway() != null) {
200200
if (nic.getIPv6Address() == null) {
201201
s_logger.debug("Found IPv6 CIDR " + network.getIp6Cidr() + " for Network " + network);
202202
nic.setIPv6Cidr(network.getIp6Cidr());
203203
nic.setIPv6Gateway(network.getIp6Gateway());
204204

205+
setNicPropertiesFromNetwork(nic, network);
206+
205207
IPv6Address ipv6addr = NetUtils.EUI64Address(network.getIp6Cidr(), nic.getMacAddress());
206208
s_logger.info("Calculated IPv6 address " + ipv6addr + " using EUI-64 for NIC " + nic.getUuid());
207209
nic.setIPv6Address(ipv6addr.toString());
@@ -217,4 +219,15 @@ public void setNicIp6Address(final NicProfile nic, final DataCenter dc, final Ne
217219
}
218220
}
219221

222+
private void setNicPropertiesFromNetwork(NicProfile nic, Network network) throws InsufficientAddressCapacityException {
223+
if (nic.getBroadcastType() == null) {
224+
nic.setBroadcastType(network.getBroadcastDomainType());
225+
}
226+
if (nic.getBroadCastUri() == null) {
227+
nic.setBroadcastUri(network.getBroadcastUri());
228+
}
229+
if (nic.getMacAddress() == null) {
230+
nic.setMacAddress(_networkModel.getNextAvailableMacAddressInNetwork(network.getId()));
231+
}
232+
}
220233
}

‎server/src/test/java/com/cloud/network/Ipv6AddressManagerTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ private void setAcquireGuestIpv6AddressTest(boolean isIPAvailable, State state)
229229
}
230230

231231
@Test
232-
public void setNICIPv6AddressTest() {
232+
public void setNICIPv6AddressTest() throws InsufficientAddressCapacityException {
233233
NicProfile nic = new NicProfile();
234234
Network network = mock(Network.class);
235235
DataCenter dc = mock(DataCenter.class);

‎systemvm/debian/opt/cloud/bin/cs/CsDhcp.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def configure_server(self):
111111
if self.config.is_dhcp() and not self.config.use_extdns():
112112
guest_ip = self.config.address().get_guest_ip()
113113
if guest_ip and guest_ip in dns_list and ip not in dns_list:
114-
## Replace the default guest IP in VR with the ip in additional IP ranges, if shared network has multiple IP ranges.
114+
# Replace the default guest IP in VR with the ip in additional IP ranges, if shared network has multiple IP ranges.
115115
dns_list.remove(guest_ip)
116116
dns_list.insert(0, ip)
117117
line = "dhcp-option=tag:interface-%s-%s,6,%s" % (device, idx, ','.join(dns_list))

‎ui/src/components/view/ResourceLimitTab.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ export default {
119119
120120
if (this.formLoading) return
121121
122-
this.form.validateFields((err, values) => {
122+
this.form.validateFieldsAndScroll((err, values) => {
123123
if (err) {
124124
return
125125
}

‎ui/src/components/view/SearchView.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ export default {
512512
handleSubmit (e) {
513513
e.preventDefault()
514514
this.paramsFilter = {}
515-
this.form.validateFields((err, values) => {
515+
this.form.validateFieldsAndScroll((err, values) => {
516516
if (err) {
517517
return
518518
}

‎ui/src/views/AutogenView.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,7 +1201,7 @@ export default {
12011201
this.modalInfo.title = this.currentAction.label
12021202
this.modalInfo.docHelp = this.currentAction.docHelp
12031203
}
1204-
this.form.validateFields((err, values) => {
1204+
this.form.validateFieldsAndScroll((err, values) => {
12051205
if (!err) {
12061206
this.actionLoading = true
12071207
const itemsNameMap = {}
@@ -1295,7 +1295,7 @@ export default {
12951295
},
12961296
execSubmit (e) {
12971297
e.preventDefault()
1298-
this.form.validateFields((err, values) => {
1298+
this.form.validateFieldsAndScroll((err, values) => {
12991299
if (err) {
13001300
return
13011301
}
@@ -1528,7 +1528,7 @@ export default {
15281528
if (!confirmPasswordVal || confirmPasswordVal.length === 0) {
15291529
callback()
15301530
} else if (value && this.confirmDirty) {
1531-
form.validateFields(['confirmpassword'], { force: true })
1531+
form.validateFieldsAndScroll(['confirmpassword'], { force: true })
15321532
callback()
15331533
} else {
15341534
callback()

‎ui/src/views/auth/Login.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ export default {
229229
handleSubmit (e) {
230230
e.preventDefault()
231231
const {
232-
form: { validateFields },
232+
form: { validateFieldsAndScroll },
233233
state,
234234
customActiveKey,
235235
Login
@@ -238,9 +238,9 @@ export default {
238238
239239
state.loginBtn = true
240240
241-
const validateFieldsKey = customActiveKey === 'cs' ? ['username', 'password', 'domain'] : ['idp']
241+
const validateFieldsAndScrollKey = customActiveKey === 'cs' ? ['username', 'password', 'domain'] : ['idp']
242242
243-
validateFields(validateFieldsKey, { force: true }, (err, values) => {
243+
validateFieldsAndScroll(validateFieldsAndScrollKey, { force: true }, (err, values) => {
244244
if (!err) {
245245
if (this.$config.multipleServer) {
246246
this.axios.defaults.baseURL = (this.server.apiHost || '') + this.server.apiBase

0 commit comments

Comments
 (0)