feat: Enhance vCenter integration with resource pool and folder support
- Added methods to ResourceService for fetching resource pools and updated existing methods to include datacenter filtering. - Modified CreateVirtualMachine to accept folder and resource pool parameters from product data. - Updated various jobs to synchronize resource pools and include them in the provisioning process. - Introduced new ModuleResourcePool model and migration for resource pool management. - Enhanced existing models (ModuleDatastore, ModuleNetwork, Os) to include relationships with vCenter and resource pools. - Added netmask field to IpPool and updated related logic for IP reservation. - Improved error handling and logging in VM creation and IP reservation processes. - Updated API routes to include sync functionality for vCenter.
This commit is contained in:
@@ -24,18 +24,9 @@ class VmIpReservationService
|
||||
public function reserve(int $networkId, int $hostId, string $dns): ?array
|
||||
{
|
||||
return DB::transaction(function () use ($networkId, $hostId, $dns) {
|
||||
// Exclude IPs that have any active reservation (real VM or pending).
|
||||
// Also accept status='reserved' in ip_pools so stale reservations
|
||||
// (ip_pool row stuck as 'reserved' with no matching module_ip_addresses row)
|
||||
// are recoverable without manual DB cleanup.
|
||||
$allUsedIps = ModuleIpAddress::where('module_network_id', $networkId)
|
||||
->lockForUpdate()
|
||||
->pluck('ip')
|
||||
->toArray();
|
||||
|
||||
// ip_pools.status is the single source of truth for availability.
|
||||
$ipPool = IpPool::where('module_network_id', $networkId)
|
||||
->whereIn('status', ['free', 'reserved'])
|
||||
->whereNotIn('ip_address', $allUsedIps)
|
||||
->lockForUpdate()
|
||||
->inRandomOrder()
|
||||
->first();
|
||||
@@ -48,9 +39,16 @@ class VmIpReservationService
|
||||
|
||||
$cidr = (int) ($ipPool->cidr ?: 24);
|
||||
$gateway = (string) ($ipPool->gateway ?? '');
|
||||
$netmask = $this->cidrToNetmask($cidr);
|
||||
$netmask = $ipPool->netmask ?: $this->cidrToNetmask($cidr);
|
||||
|
||||
$reservation = ModuleIpAddress::create([
|
||||
// module_ip_address mirrors ip_pools — update the existing synced row
|
||||
// (created when the IP was added to ip_pools) instead of inserting a new one.
|
||||
$reservation = ModuleIpAddress::where('ip', $ipPool->ip_address)
|
||||
->where('module_network_id', $networkId)
|
||||
->lockForUpdate()
|
||||
->first();
|
||||
|
||||
$attrs = [
|
||||
'vm_name' => '__pending__',
|
||||
'module_host_id' => $hostId,
|
||||
'module_network_id' => $networkId,
|
||||
@@ -59,7 +57,13 @@ class VmIpReservationService
|
||||
'netmask' => $netmask,
|
||||
'dns' => $dns,
|
||||
'status' => 0,
|
||||
]);
|
||||
];
|
||||
|
||||
if ($reservation) {
|
||||
$reservation->update($attrs);
|
||||
} else {
|
||||
$reservation = ModuleIpAddress::create($attrs);
|
||||
}
|
||||
|
||||
return [
|
||||
'reservation' => $reservation,
|
||||
@@ -73,7 +77,7 @@ class VmIpReservationService
|
||||
public function release(ModuleIpAddress $reservation, ?int $ipPoolId): void
|
||||
{
|
||||
try {
|
||||
$reservation->delete();
|
||||
$reservation->update(['vm_name' => null, 'status' => 0]);
|
||||
if ($ipPoolId) {
|
||||
IpPool::where('id', $ipPoolId)->update(['status' => 'free']);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user