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

Merge branch '4.20'

Browse Source
This commit is contained in:
Suresh Kumar Anaparti 2025-08-21 18:35:34 +05:30
commit e0bc8c3b1a
No known key found for this signature in database
GPG Key ID: D7CEAE3A9E71D0AA
2 changed files with 2 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,7 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.Comparator; import java.util.Comparator;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
@ -1310,6 +1311,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
IPAddressVO lockedIpVO = _ipAddressDao.acquireInLockTable(ipVO.getId()); IPAddressVO lockedIpVO = _ipAddressDao.acquireInLockTable(ipVO.getId());
validateLockedRequestedIp(ipVO, lockedIpVO); validateLockedRequestedIp(ipVO, lockedIpVO);
lockedIpVO.setState(IPAddressVO.State.Allocated); lockedIpVO.setState(IPAddressVO.State.Allocated);
lockedIpVO.setAllocatedTime(new Date());
_ipAddressDao.update(lockedIpVO.getId(), lockedIpVO); _ipAddressDao.update(lockedIpVO.getId(), lockedIpVO);
} finally { } finally {
_ipAddressDao.releaseFromLockTable(ipVO.getId()); _ipAddressDao.releaseFromLockTable(ipVO.getId());

59
ui/src/views/infra/network/ServiceProvidersTab.vue
View File

@ -535,65 +535,6 @@ export default {
], ],
details: ['name', 'state', 'id', 'servicelist', 'physicalnetworkid'] details: ['name', 'state', 'id', 'servicelist', 'physicalnetworkid']
}, },
{
title: 'F5BigIp',
actions: [
{
api: 'addF5LoadBalancer',
listView: true,
icon: 'plus-outlined',
label: 'label.add.f5.device',
component: shallowRef(defineAsyncComponent(() => import('@/views/infra/network/providers/AddF5LoadBalancer.vue')))
},
{
api: 'updateNetworkServiceProvider',
icon: 'stop-outlined',
listView: true,
label: 'label.disable.provider',
confirm: 'message.confirm.disable.provider',
show: (record) => { return record && record.id && record.state === 'Enabled' },
mapping: {
state: {
value: (record) => { return 'Disabled' }
}
}
},
{
api: 'updateNetworkServiceProvider',
icon: 'play-circle-outlined',
listView: true,
label: 'label.enable.provider',
confirm: 'message.confirm.enable.provider',
show: (record) => { return record && record.id && record.state === 'Disabled' },
mapping: {
state: {
value: (record) => { return 'Enabled' }
}
}
},
{
api: 'deleteNetworkServiceProvider',
listView: true,
icon: 'poweroff-outlined',
label: 'label.shutdown.provider',
confirm: 'message.confirm.delete.provider',
show: (record) => { return record && record.id }
}
],
details: ['name', 'state', 'id', 'servicelist'],
lists: [
{
title: 'label.devices',
api: 'listF5LoadBalancers',
mapping: {
physicalnetworkid: {
value: (record) => { return record.physicalnetworkid }
}
},
columns: ['ipaddress', 'lbdevicestate', 'actions']
}
]
},
{ {
title: 'GloboDns', title: 'GloboDns',
actions: [ actions: [