diff --git a/web/app/Services/Cloud/CloudAdminResourceService.php b/web/app/Services/Cloud/CloudAdminResourceService.php index c1453f38..eb85f475 100644 --- a/web/app/Services/Cloud/CloudAdminResourceService.php +++ b/web/app/Services/Cloud/CloudAdminResourceService.php @@ -17,7 +17,7 @@ use App\Models\CloudResourceReservation; /** Database-only administrator projections for regions, lines, pools and reservations. */ final class CloudAdminResourceService { - private const VIEWS = ['topology', 'capacity', 'reservations']; + private const VIEWS = ['topology', 'capacity', 'reservations', 'traffic']; private const REGION_STATUSES = ['active', 'disabled']; private const LINE_STATUSES = ['active', 'disabled']; private const POOL_STATUSES = ['active', 'draining', 'disabled']; @@ -29,6 +29,14 @@ final class CloudAdminResourceService $requested = $query['view'] ?? 'topology'; $view = is_string($requested) && in_array($requested, self::VIEWS, true) ? $requested : 'topology'; + if ($view === 'traffic') { + return [ + 'view' => 'traffic', + 'focus' => 'all', + 'traffic_pools' => CloudAdminTrafficPoolService::page($query), + 'generated_at' => time(), + ]; + } $catalog = self::catalog(); $focus = is_string($query['focus'] ?? null) ? $query['focus'] : 'all'; if (!in_array($focus, ['all', 'ready_pools', 'hosts', 'ready_hosts', 'cpu', 'ip'], true)) { @@ -37,13 +45,25 @@ final class CloudAdminResourceService $reservationPage = $view === 'reservations' ? self::reservations($query) : self::emptyReservationPage(); - return array_merge($catalog, self::capacitySelection($catalog, $focus), [ 'view' => $view, 'focus' => $focus, 'line_feature_enabled' => CloudNetworkLineFeature::enabled(), 'country_options' => CloudCountryCatalog::options(), 'reservations' => $reservationPage, + 'traffic_pools' => [ + 'items' => [], + 'lines' => [], + 'summary' => [ + 'groups_total' => 0, + 'disabled' => 0, + 'shadow' => 0, + 'enforced' => 0, + 'ready_to_enforce' => 0, + ], + 'sample_freshness_seconds' => 300, + 'generated_at' => time(), + ], 'generated_at' => time(), ]); } diff --git a/web/app/Services/Cloud/CloudAdminTrafficPoolService.php b/web/app/Services/Cloud/CloudAdminTrafficPoolService.php index f46d84b9..5a7b6796 100644 --- a/web/app/Services/Cloud/CloudAdminTrafficPoolService.php +++ b/web/app/Services/Cloud/CloudAdminTrafficPoolService.php @@ -7,6 +7,7 @@ use App\Models\CloudInstanceNetworkPolicyState; use App\Models\CloudInstanceNetworkRestriction; use App\Models\CloudNetworkLine; use App\Models\CloudOrder; +use App\Models\CloudRegion; use App\Models\CloudResourcePool; use App\Models\CloudServicePeriod; use App\Models\CloudTrafficEntitlement; @@ -21,16 +22,49 @@ final class CloudAdminTrafficPoolService { private const MODES = ['disabled', 'shadow', 'enforced']; private const SAMPLE_FRESHNESS_SECONDS = 300; + private const BLOCKER_LABELS = [ + 'no_network_lines' => '尚未绑定线路', + 'line_frozen_identity_mismatch' => '订单或服务周期的冻结身份不一致', + 'pool_attention' => '账本池需要人工核查', + 'projection_invalid' => '账本投影校验失败', + 'missing_entitlements' => '服务周期缺少流量权益', + 'missing_pools' => '流量权益缺少账本池', + 'period_identity_mismatch' => '服务周期与流量权益不一致', + 'instance_not_ready' => '实例尚未达到核算条件', + 'usage_unsettled' => '最新流量尚未完成结算', + 'legacy_network_unsettled' => '实例网络状态尚未收敛', + 'cursor_attention' => '实例核算游标需要人工核查', + 'cursor_missing' => '实例缺少有效核算游标', + 'traffic_sample_stale' => '流量采样已过期', + 'traffic_scan_failures' => '流量扫描存在失败记录', + 'policy_unsettled' => '实例网络策略尚未应用', + 'traffic_restriction_present' => '仍有共享流量池断网限制', + 'network_job_unsettled' => '仍有网络任务未完成', + ]; public static function page(array $query = []): array { $items = []; + $summary = [ + 'groups_total' => 0, + 'disabled' => 0, + 'shadow' => 0, + 'enforced' => 0, + 'ready_to_enforce' => 0, + ]; foreach (CloudTrafficPoolGroup::orderBy('id')->get() as $group) { - $items[] = self::groupDto($group); + $item = self::groupDto($group); + $items[] = $item; + $summary['groups_total']++; + $summary[$item['mode']]++; + if ($item['readiness']['can_enforce']) { + $summary['ready_to_enforce']++; + } } return [ 'items' => $items, 'lines' => self::lineCatalog(), + 'summary' => $summary, 'sample_freshness_seconds' => self::SAMPLE_FRESHNESS_SECONDS, 'generated_at' => time(), ]; @@ -546,6 +580,8 @@ final class CloudAdminTrafficPoolService sort($subjectIds, SORT_NUMERIC); $list[] = [ 'code' => $code, + 'label' => self::BLOCKER_LABELS[$code] + ?? '存在未识别的就绪阻断项', 'count' => count($subjectIds), 'subject_ids' => array_slice($subjectIds, 0, 20), ]; @@ -604,12 +640,22 @@ final class CloudAdminTrafficPoolService private static function lineCatalog(): array { + $lines = CloudNetworkLine::orderBy('region_id')->orderBy('sort') + ->orderBy('id')->get(); + $regionIds = $lines->pluck('region_id')->map( + static fn ($id): int => (int) $id + )->unique()->values()->all(); + $regions = $regionIds === [] ? collect() : CloudRegion::whereIn( + 'id', $regionIds + )->pluck('name', 'id'); $items = []; - foreach (CloudNetworkLine::orderBy('region_id')->orderBy('sort') - ->orderBy('id')->get() as $line) { + foreach ($lines as $line) { $items[] = [ 'id' => (int) $line->id, 'region_id' => (int) $line->region_id, + 'region_name' => (string) ( + $regions[(int) $line->region_id] ?? '未知地区' + ), 'code' => (string) $line->code, 'name' => (string) $line->name, 'status' => (string) $line->status, diff --git a/web/public/cloud/admin-traffic-pools.js b/web/public/cloud/admin-traffic-pools.js new file mode 100644 index 00000000..459df4e0 --- /dev/null +++ b/web/public/cloud/admin-traffic-pools.js @@ -0,0 +1,207 @@ +const root = document.querySelector('[data-admin-resources][data-resource-view="traffic"]'); +const bootstrapNode = document.getElementById('admin-resources-bootstrap'); +let page = null; +try { page = JSON.parse(bootstrapNode?.textContent || 'null'); } catch { page = null; } + +if (root) { + const requestRuntime = window.VenixAdminRequestRuntime.create(); + const drawerState = { dialog: null, opener: null, scrollY: 0 }; + + function byId(id) { return document.getElementById(id); } + function group(id) { + return (page?.traffic_pools?.items || []).find(item => String(item.id) === String(id)) || null; + } + function notice(id, message, tone = '') { + const node = byId(id); + if (!node) return; + node.textContent = message; + node.className = `admin-config-status mt-3 ${tone ? `is-${tone}` : ''}`; + node.setAttribute('role', tone === 'error' ? 'alert' : 'status'); + } + function pageNotice(message, error = false) { + const node = byId('resource-notice'); + if (!node) return; + node.textContent = message; + node.className = `admin-config-status ${error ? 'is-error' : 'is-success'}`; + node.setAttribute('role', error ? 'alert' : 'status'); + } + async function mutate(path, options) { + return requestRuntime.mutate(path, { + method: options.method, + body: options.body, + timeoutMs: 20000, + response: 'json', + }); + } + function openDrawer(dialog, opener) { + if (!dialog) return; + drawerState.dialog = dialog; + drawerState.opener = opener || document.activeElement; + drawerState.scrollY = window.scrollY; + document.documentElement.style.setProperty('--admin-instance-scroll-top', `-${drawerState.scrollY}px`); + document.documentElement.classList.add('admin-instance-detail-open'); + window.VenixDrawerMotion?.openDrawerWithMotion(dialog) || dialog.showModal(); + } + async function closeDrawer(dialog) { + if (!dialog?.open) return; + if (window.VenixDrawerMotion) await window.VenixDrawerMotion.closeDrawerWithMotion(dialog); + else dialog.close(); + document.documentElement.classList.remove('admin-instance-detail-open'); + document.documentElement.style.removeProperty('--admin-instance-scroll-top'); + window.scrollTo({ top: drawerState.scrollY, left: 0, behavior: 'instant' }); + const opener = drawerState.opener; + drawerState.dialog = null; + drawerState.opener = null; + if (opener instanceof HTMLElement && opener.isConnected) opener.focus({ preventScroll: true }); + } + + for (const dialog of document.querySelectorAll('[data-admin-traffic-drawer]')) { + dialog.addEventListener('cancel', event => { event.preventDefault(); void closeDrawer(dialog); }); + dialog.addEventListener('click', event => { if (event.target === dialog) void closeDrawer(dialog); }); + } + byId('traffic-group-editor-close')?.addEventListener('click', () => void closeDrawer(byId('traffic-group-editor'))); + byId('traffic-line-editor-close')?.addEventListener('click', () => void closeDrawer(byId('traffic-line-editor'))); + + function configureGroupEditor(item = null) { + const form = byId('traffic-group-editor-form'); + if (!form) return false; + form.reset(); + form.elements.namedItem('group_id').value = item?.id || ''; + form.elements.namedItem('expected_revision').value = item?.revision || ''; + form.elements.namedItem('name').value = item?.name || ''; + const codeField = form.querySelector('[data-traffic-code-field]'); + const codeInput = form.elements.namedItem('code'); + codeField.hidden = Boolean(item); + codeInput.disabled = Boolean(item); + codeInput.required = !item; + byId('traffic-group-editor-title').textContent = item ? '修改分组名称' : '新建流量池分组'; + byId('traffic-group-editor-eyebrow').textContent = item ? `${item.name} · r${item.revision}` : '共享流量池'; + notice('traffic-group-editor-notice', '等待提交'); + return true; + } + + function configureLineEditor(item) { + const form = byId('traffic-line-editor-form'); + if (!form || !item) return false; + form.reset(); + form.elements.namedItem('group_id').value = item.id; + form.elements.namedItem('expected_revision').value = item.revision; + byId('traffic-line-editor-title').textContent = `配置 ${item.name} 的线路`; + for (const checkbox of form.querySelectorAll('input[name="line_ids[]"]')) { + const owner = Number(checkbox.dataset.lineOwner || 0); + checkbox.checked = owner === Number(item.id); + checkbox.disabled = owner > 0 && owner !== Number(item.id); + checkbox.closest('label')?.classList.toggle('is-unavailable', checkbox.disabled); + } + notice('traffic-line-editor-notice', '等待提交'); + return true; + } + + root.addEventListener('click', async event => { + const create = event.target.closest('[data-traffic-create]'); + if (create && configureGroupEditor()) { + openDrawer(byId('traffic-group-editor'), create); + return; + } + const rename = event.target.closest('[data-traffic-rename]'); + if (rename) { + const item = group(rename.dataset.trafficRename); + if (!item) return pageNotice('找不到流量池分组,请刷新页面。', true); + if (configureGroupEditor(item)) openDrawer(byId('traffic-group-editor'), rename); + return; + } + const lines = event.target.closest('[data-traffic-lines]'); + if (lines) { + const item = group(lines.dataset.trafficLines); + if (!item) return pageNotice('找不到流量池分组,请刷新页面。', true); + if (configureLineEditor(item)) openDrawer(byId('traffic-line-editor'), lines); + return; + } + const modeButton = event.target.closest('[data-traffic-mode]'); + if (!modeButton || modeButton.disabled) return; + const item = group(modeButton.dataset.trafficMode); + const targetMode = modeButton.dataset.targetMode; + if (!item || !['disabled', 'shadow', 'enforced'].includes(targetMode)) { + return pageNotice('流量池状态操作无效,请刷新页面。', true); + } + const config = targetMode === 'enforced' ? { + tone: 'danger', + title: '开始强制执行共享流量池', + message: '启用后会按照共享余额真实限制实例网络,且不能回退、停用或调整线路。请确认就绪检查与业务验收均已完成。', + confirmText: '开始强制执行', + requiredText: item.name, + requiredLabel: '输入完整分组名称以确认', + } : (targetMode === 'shadow' ? { + tone: 'warning', + title: '进入影子核算', + message: '系统将开始建立真实账本投影,但暂不因共享额度限制实例网络。', + confirmText: '进入影子核算', + } : { + tone: 'warning', + title: '停用影子核算', + message: '仅在尚未形成持久服务周期或账本引用时允许停用。', + confirmText: '确认停用', + }); + if (!await window.VenixAdminDangerDialog.confirm(config)) return; + modeButton.disabled = true; + pageNotice('正在更新流量池模式…'); + try { + await mutate(`/api/v1/admin/traffic-pool-groups/${item.id}`, { + method: 'PATCH', + body: { mode: targetMode, expected_revision: Number(item.revision) }, + }); + pageNotice('流量池模式已更新,正在刷新…'); + location.reload(); + } catch (error) { + pageNotice(error.message || '流量池模式更新失败,请刷新后核对。', true); + modeButton.disabled = false; + } + }); + + byId('traffic-group-editor-form')?.addEventListener('submit', async event => { + event.preventDefault(); + const form = event.currentTarget; + if (!form.reportValidity()) return; + const groupId = form.elements.namedItem('group_id').value; + const submit = byId('traffic-group-editor-submit'); + const body = { name: form.elements.namedItem('name').value.trim() }; + if (groupId) body.expected_revision = Number(form.elements.namedItem('expected_revision').value); + else body.code = form.elements.namedItem('code').value.trim().toLowerCase(); + submit.disabled = true; + notice('traffic-group-editor-notice', '正在保存…', 'loading'); + try { + await mutate(`/api/v1/admin/traffic-pool-groups${groupId ? `/${groupId}` : ''}`, { + method: groupId ? 'PATCH' : 'POST', body, + }); + notice('traffic-group-editor-notice', '已保存,正在刷新…', 'success'); + location.reload(); + } catch (error) { + notice('traffic-group-editor-notice', error.message || '保存失败,请刷新后重试。', 'error'); + submit.disabled = false; + } + }); + + byId('traffic-line-editor-form')?.addEventListener('submit', async event => { + event.preventDefault(); + const form = event.currentTarget; + const groupId = Number(form.elements.namedItem('group_id').value); + const item = group(groupId); + if (!item) return notice('traffic-line-editor-notice', '分组版本已失效,请刷新页面。', 'error'); + const lineIds = Array.from(form.querySelectorAll('input[name="line_ids[]"]:checked:not(:disabled)'), + checkbox => Number(checkbox.value)); + const submit = byId('traffic-line-editor-submit'); + submit.disabled = true; + notice('traffic-line-editor-notice', '正在保存线路…', 'loading'); + try { + await mutate(`/api/v1/admin/traffic-pool-groups/${groupId}/lines`, { + method: 'PUT', + body: { line_ids: lineIds, expected_revision: Number(item.revision) }, + }); + notice('traffic-line-editor-notice', '线路已保存,正在刷新…', 'success'); + location.reload(); + } catch (error) { + notice('traffic-line-editor-notice', error.message || '线路保存失败,请刷新后重试。', 'error'); + submit.disabled = false; + } + }); +} diff --git a/web/public/theme/venix/css/admin-home.css b/web/public/theme/venix/css/admin-home.css index 6bba0120..52500fcb 100644 --- a/web/public/theme/venix/css/admin-home.css +++ b/web/public/theme/venix/css/admin-home.css @@ -2629,7 +2629,7 @@ html.admin-instance-detail-open body { [data-admin-resources] .admin-resource-tabs { display: grid; - grid-template-columns: repeat(3, minmax(0, 1fr)); + grid-template-columns: repeat(4, minmax(0, 1fr)); gap: 8px; margin-bottom: 16px; padding: 5px; @@ -2943,6 +2943,208 @@ html.admin-instance-detail-open body { line-height: 1.45; } +[data-admin-resources] .admin-traffic-group-list { + display: grid; + gap: 16px; +} + +[data-admin-resources] .admin-traffic-group { + display: grid; + gap: 16px; + padding: 18px; + border: 1px solid #dfe7f1; + border-radius: 14px; + background: #fff; + box-shadow: 0 8px 24px rgba(39, 63, 93, .05); +} + +[data-admin-resources] .admin-traffic-group-header, +[data-admin-resources] .admin-traffic-actions { + display: flex; + align-items: center; + justify-content: space-between; + gap: 12px; + flex-wrap: wrap; +} + +[data-admin-resources] .admin-traffic-group-header h3 { + margin: 0; + color: #172338; + font-size: 17px; + font-weight: 800; +} + +[data-admin-resources] .admin-traffic-mode { + display: inline-flex; + align-items: center; + min-height: 30px; + padding: 5px 10px; + border-radius: 999px; + font-size: 12px; + font-weight: 800; + white-space: nowrap; +} + +[data-admin-resources] .admin-traffic-mode.is-disabled { + color: #667386; + background: #e9edf2; +} + +[data-admin-resources] .admin-traffic-mode.is-shadow { + color: #8b5d00; + background: rgba(245, 177, 48, .18); +} + +[data-admin-resources] .admin-traffic-mode.is-enforced { + color: #a7272f; + background: rgba(232, 69, 79, .13); +} + +[data-admin-resources] .admin-traffic-metrics { + display: grid; + grid-template-columns: repeat(4, minmax(0, 1fr)); + gap: 10px; +} + +[data-admin-resources] .admin-traffic-metrics > div { + display: grid; + gap: 3px; + min-width: 0; + padding: 12px; + border-radius: 10px; + background: #f6f9fc; +} + +[data-admin-resources] .admin-traffic-metrics span, +[data-admin-resources] .admin-traffic-lines-label { + color: #7b899b; + font-size: 11px; + font-weight: 700; +} + +[data-admin-resources] .admin-traffic-metrics strong { + color: #25364d; + font-size: 18px; +} + +[data-admin-resources] .admin-traffic-lines { + display: grid; + gap: 7px; +} + +[data-admin-resources] .admin-traffic-lines > div { + display: flex; + gap: 7px; + flex-wrap: wrap; +} + +[data-admin-resources] .admin-traffic-line-chip { + display: inline-flex; + align-items: center; + gap: 5px; + padding: 5px 8px; + border: 1px solid #dfe7f1; + border-radius: 8px; + color: #43546a; + background: #f8fafc; + font-size: 12px; + font-weight: 700; +} + +[data-admin-resources] .admin-traffic-readiness { + margin: 0; + padding: 12px 14px; + border-radius: 10px; + font-size: 13px; +} + +[data-admin-resources] .admin-traffic-readiness.is-ready { + color: #08785b; + background: rgba(38, 189, 138, .1); +} + +[data-admin-resources] .admin-traffic-readiness.is-blocked { + color: #8e2a31; + background: rgba(232, 69, 79, .08); +} + +[data-admin-resources] .admin-traffic-readiness > p { + margin: 0; + font-weight: 700; +} + +[data-admin-resources] .admin-traffic-readiness > p i, +[data-admin-resources] .admin-traffic-readiness.is-ready > i { + margin-right: 6px; +} + +[data-admin-resources] .admin-traffic-readiness ul { + display: grid; + gap: 8px; + margin: 10px 0 0; + padding: 0; + list-style: none; +} + +[data-admin-resources] .admin-traffic-readiness li { + display: grid; + grid-template-columns: minmax(0, 1fr) auto; + gap: 3px 12px; + padding-top: 8px; + border-top: 1px solid rgba(167, 39, 47, .12); +} + +[data-admin-resources] .admin-traffic-readiness details { + grid-column: 1 / -1; + color: #7d5960; + font-size: 11px; +} + +[data-admin-resources] .admin-traffic-actions { + justify-content: flex-start; + padding-top: 2px; +} + +[data-admin-traffic-drawer] .admin-resource-form-fields { + display: grid; + gap: 16px; +} + +[data-admin-traffic-drawer] .admin-resource-form-fields > label { + display: grid; + gap: 6px; +} + +[data-admin-traffic-drawer] .admin-traffic-line-options { + display: grid; + gap: 10px; +} + +[data-admin-traffic-drawer] .admin-traffic-line-options > label { + display: flex; + align-items: flex-start; + gap: 11px; + padding: 12px; + border: 1px solid #e0e8f1; + border-radius: 10px; + cursor: pointer; +} + +[data-admin-traffic-drawer] .admin-traffic-line-options > label.is-unavailable { + cursor: not-allowed; + opacity: .55; +} + +[data-admin-traffic-drawer] .admin-traffic-line-options span, +[data-admin-traffic-drawer] .admin-traffic-line-options small { + display: block; +} + +[data-admin-traffic-drawer] .admin-traffic-line-options small { + margin-top: 3px; + color: #7b899b; +} + [data-admin-resource-drawer] .admin-resource-form-fields { display: grid; gap: 16px; @@ -3034,6 +3236,24 @@ html.admin-instance-detail-open body { grid-template-columns: 1fr; } + [data-admin-resources] .admin-traffic-group { + padding: 14px; + } + + [data-admin-resources] .admin-traffic-group-header, + [data-admin-resources] .admin-traffic-actions { + align-items: stretch; + flex-direction: column; + } + + [data-admin-resources] .admin-traffic-actions .btn { + width: 100%; + } + + [data-admin-resources] .admin-traffic-metrics { + grid-template-columns: repeat(2, minmax(0, 1fr)); + } + [data-admin-resources] .admin-resource-responsive-table, [data-admin-resources] .admin-resource-responsive-table tbody, [data-admin-resources] .admin-resource-responsive-table tr, diff --git a/web/resources/views/venix/admin/cloud/resources.tpl b/web/resources/views/venix/admin/cloud/resources.tpl index 3a1342a1..d5f7ba7f 100644 --- a/web/resources/views/venix/admin/cloud/resources.tpl +++ b/web/resources/views/venix/admin/cloud/resources.tpl @@ -9,7 +9,7 @@ {/function} {if !$resource_page} - {assign var=resource_page value=['view'=>'topology','line_feature_enabled'=>false,'summary'=>['regions_total'=>0,'lines_total'=>0,'pools_total'=>0,'placement_ready_pools'=>0,'hosts_total'=>0,'placement_ready_hosts'=>0,'held_reservations'=>0,'uncertain_reservations'=>0],'country_options'=>[],'topology'=>[],'regions'=>[],'lines'=>[],'pools'=>[],'reservations'=>['items'=>[],'filters'=>['state'=>'','pool_id'=>'','q'=>''],'pagination'=>['page'=>1,'per_page'=>20,'total'=>0,'total_pages'=>1,'from'=>0,'to'=>0]] ]} + {assign var=resource_page value=['view'=>'topology','line_feature_enabled'=>false,'summary'=>['regions_total'=>0,'lines_total'=>0,'pools_total'=>0,'placement_ready_pools'=>0,'hosts_total'=>0,'placement_ready_hosts'=>0,'held_reservations'=>0,'uncertain_reservations'=>0],'country_options'=>[],'topology'=>[],'regions'=>[],'lines'=>[],'pools'=>[],'reservations'=>['items'=>[],'filters'=>['state'=>'','pool_id'=>'','q'=>''],'pagination'=>['page'=>1,'per_page'=>20,'total'=>0,'total_pages'=>1,'from'=>0,'to'=>0]],'traffic_pools'=>['items'=>[],'lines'=>[],'summary'=>['groups_total'=>0,'disabled'=>0,'shadow'=>0,'enforced'=>0,'ready_to_enforce'=>0]] ]} {/if} {if !$resource_page.focus}{assign var=resource_focus value='all'}{else}{assign var=resource_focus value=$resource_page.focus}{/if} @@ -27,6 +27,7 @@ 资源拓扑 容量与健康 资源预留 + 共享流量池 {if $resource_page.view == 'topology'} @@ -127,6 +128,75 @@ {/if} + {elseif $resource_page.view == 'traffic'} +
+

分组总数

{$resource_page.traffic_pools.summary.groups_total|default:0|escape}

按线路隔离流量账本

+

影子核算

{$resource_page.traffic_pools.summary.shadow|default:0|escape}

只核算,不影响网络

+

可进入强制执行

{$resource_page.traffic_pools.summary.ready_to_enforce|default:0|escape}

全部就绪门禁已通过

+

强制执行

{$resource_page.traffic_pools.summary.enforced|default:0|escape}

额度耗尽会聚合断网

+
+ +
+
+
+

共享流量池分组

+ 每条线路只能属于一个分组;停用 → 影子核算 → 强制执行为单向上线流程。 +
+ {if $admin_can_manage|default:false}{/if} +
+
+
+ {foreach $resource_page.traffic_pools.items as $group} +
+
+
+ +

{$group.name|escape}

{$group.code|escape} · 配置版本 {$group.revision|escape}

+
+ {if $group.mode == 'disabled'}停用{elseif $group.mode == 'shadow'}影子核算{else}强制执行{/if} +
+ +
+
绑定线路{$group.readiness.line_count|default:0|escape}
+
账本池{$group.readiness.pool_count|default:0|escape}
+
服务周期{$group.readiness.period_count|default:0|escape}
+
活跃实例{$group.readiness.active_instance_count|default:0|escape}
+
+ +
+ 线路 +
{foreach $resource_page.traffic_pools.lines as $line}{if $line.traffic_pool_group_id == $group.id}{$line.region_name|escape} · {$line.name|escape} {$line.code|escape}{/if}{foreachelse}尚无可用线路{/foreach}{if $group.line_count == 0}尚未绑定线路{/if}
+
+ + {if $group.readiness.ready} +

{if $group.mode == 'shadow'}就绪门禁已通过,可以进入强制执行。{elseif $group.mode == 'enforced'}强制执行中的账本与网络状态已通过校验。{else}当前配置未发现就绪阻断项。{/if}

+ {else} +
+

{if $group.mode == 'enforced'}强制执行状态存在 {$group.readiness.blockers|@count|escape} 类异常,需要立即核查。{else}当前存在 {$group.readiness.blockers|@count|escape} 类阻断项,不能进入强制执行。{/if}

+
    {foreach $group.readiness.blockers as $blocker}
  • {$blocker.label|escape}{$blocker.count|escape} 项
    技术信息{$blocker.code|escape}{if $blocker.subject_ids} · ID {foreach $blocker.subject_ids as $subject_id}{$subject_id|escape}{if !$subject_id@last}, {/if}{/foreach}{/if}
  • {/foreach}
+
+ {/if} + + {if $admin_can_manage|default:false} +
+ + {if $group.actions.can_replace_lines}{/if} + {if $group.actions.next_mode == 'shadow'} + + {elseif $group.actions.next_mode == 'enforced'} + + {/if} + {if $group.actions.can_disable}{/if} + {if $group.mode == 'enforced'}强制执行后不可回退、停用或调整线路。{/if} +
+ {/if} +
+ {foreachelse} +
尚未建立共享流量池分组先创建分组并绑定线路,再进入影子核算进行验收。
+ {/foreach} +
+
+
{else}

查找资源预留

预留记录只读;异常保留不会自动重放操作或释放资源。
清空

资源预留

显示 {$resource_page.reservations.pagination.from|escape}–{$resource_page.reservations.pagination.to|escape} 条
共 {$resource_page.reservations.pagination.total|escape} 条
@@ -135,7 +205,31 @@ {/if} -{if $admin_can_manage|default:false} +{if $admin_can_manage|default:false && $resource_page.view == 'traffic'} + +

共享流量池

新建分组

+
+
+ + +
+

等待提交

+ +
分组不提供硬删除;上线状态通过单向流程控制。
+
+ + +

共享流量池

配置线路

+
+

每条线路只能属于一个共享流量池分组。已被其他分组占用的线路不可选择。

+
{foreach $resource_page.traffic_pools.lines as $line}{foreachelse}

尚未建立线路,请先在资源拓扑中创建线路。

{/foreach}
+

等待提交

+ +
只有停用且尚未形成持久账本引用的分组可以调整线路。
+
+{/if} + +{if $admin_can_manage|default:false && $resource_page.view != 'traffic'}

资源目录

编辑资源

@@ -164,4 +258,5 @@ +{if $resource_page.view == 'traffic'}{/if} {include file='admin/static_footer.tpl'} diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index 52873f47..089908fc 100644 --- a/web/resources/views/venix/layout_assets.tpl +++ b/web/resources/views/venix/layout_assets.tpl @@ -1,2 +1,2 @@ {* Shared Venix CSS/JS cache key. Increment whenever a shared browser asset changes. *} -{assign var=venix_asset_version value='2026103135' scope='global'} +{assign var=venix_asset_version value='2026110101' scope='global'} diff --git a/web/tests/AdminResourceProjectionContractTest.php b/web/tests/AdminResourceProjectionContractTest.php index 0b86de98..db96b2b9 100644 --- a/web/tests/AdminResourceProjectionContractTest.php +++ b/web/tests/AdminResourceProjectionContractTest.php @@ -20,7 +20,7 @@ $assert = static function (bool $condition, string $message): void { $assert(str_contains( $source, - "private const VIEWS = ['topology', 'capacity', 'reservations']" + "private const VIEWS = ['topology', 'capacity', 'reservations', 'traffic']" ) && str_contains($source, "'topology' => self::topology(") && str_contains($source, "'effective_state' => \$effective['state']") diff --git a/web/tests/AdminResourceSchedulingContractTest.php b/web/tests/AdminResourceSchedulingContractTest.php index f5842e22..144031e5 100644 --- a/web/tests/AdminResourceSchedulingContractTest.php +++ b/web/tests/AdminResourceSchedulingContractTest.php @@ -107,7 +107,7 @@ $assert($refund !== '' && $stockPosition < $releasePosition, 'Create refunds must lock offer stock before host resources to match payment placement lock order.'); -foreach (['资源拓扑', '容量与健康', '资源预留'] as $label) { +foreach (['资源拓扑', '容量与健康', '资源预留', '共享流量池'] as $label) { $assert(str_contains($template, '>' . $label . '<') || str_contains($template, '>' . $label . ''), 'Resource page is missing a persistent tab: ' . $label); } @@ -122,7 +122,7 @@ $assert(!str_contains($template, 'view=overview') && str_contains($template, 'data-parent-region-id="{$region.id|escape}"') && str_contains($template, 'data-parent-line-id="{$region.default_line_id|escape}"') && str_contains($template, 'data-parent-line-id="{$line.id|escape}"'), - 'Resource navigation and hierarchy must use the three-view clean-break topology contract.'); + 'Resource navigation and hierarchy must use the clean-break topology and traffic-pool contract.'); $assert(str_contains($template, '{if $admin_can_manage|default:false} CloudAdminTrafficPoolService::page(\$query)") + && str_contains($template, 'href="/admin/resources?view=traffic"') + && str_contains($template, + '
预留位置资源关联状态时间操作