mirror of
https://github.com/OpenNebula/one.git
synced 2026-10-24 12:20:01 +09:00
This PR adds Group VLAN authorization rules for Virtual Network self-provisioning
through VN Template instantiation and VNET updates derived from a VN Template.
The feature lets administrators define VLAN usage policies at group level. These policies are
evaluated when users instantiate VN Templates or update VNETs that were instantiated from a VN
Template. Direct VNET allocation is not treated as the tenant self-provisioning path; the intended
multi-tenant model is to expose network creation through reservations and VN Template
instantiation, while direct VNET allocation remains an admin-controlled operation.
Group VLAN rules are stored under `VLAN_RULES` as `RULE` vector attributes.
Rule format:
```txt
RULE = [
ID = "5,6,100-200",
SCOPE = "CVLAN",
VNTEMPLATE = "10,20-30"
]
Fields:
- ID: VLAN values allowed by the rule. Supports single values and ranges, comma-separated.
- Examples: "5", "5,6,100-200"
- SCOPE: VLAN attribute scope controlled by the rule.
- Supported scopes: VLAN_ID, OUTER_VLAN_ID, CVLAN, VLAN_TAGGED_ID, ANY
- VNTEMPLATE: optional VN Template IDs where the rule applies.
- Supports single values and ranges, comma-separated.
- -1 or missing value means the rule applies to any VN Template.
Examples:
RULE = [
ID = "100-200",
SCOPE = "VLAN_ID",
VNTEMPLATE = "10"
]
Allows VLAN_ID values from 100 to 200 when instantiating or updating VNETs derived from VN Template
10.
RULE = [
ID = "300,400-450",
SCOPE = "ANY",
VNTEMPLATE = "-1"
]
Allows the listed VLAN IDs/ranges for any supported VLAN scope and any VN Template.
Rules are parsed into an internal structured representation when group VLAN data is loaded or
updated. Each rule is normalized into:
- scope
- VLAN ID ranges
- VN Template ID ranges
This avoids reparsing raw template attributes during authorization checks.
Validation is applied to these input scopes:
- VLAN_ID
- OUTER_VLAN_ID
- CVLAN
- VLAN_TAGGED_ID
VLAN_ID and OUTER_VLAN_ID are validated as single integer values. CVLAN and VLAN_TAGGED_ID accept
range expressions such as 5,6-10.
For each requested VLAN value or range:
1. The input is parsed into one or more test ranges.
2. Rules are scanned for matching scope, including ANY.
3. Rules are filtered by VN Template ID:
- empty/-1 VNTEMPLATE matches all templates
- explicit ranges match only included template IDs
4. A requested range is accepted only if it is fully covered by a single rule range.
5. The check passes when all requested ranges are covered.
Automatic VLAN selection is rejected when the user belongs to a group with VLAN rules matching the
target VN Template, including global rules. This avoids bypassing explicit group VLAN policy
through automatic allocation.
VNETs instantiated from VN Templates now preserve the source VN Template ID as a first-class VNET
attribute:
<VNET>
...
<TEMPLATE_ID>...</TEMPLATE_ID>
...
</VNET>
TEMPLATE_ID = -1 means the VNET was created directly and was not instantiated from a VN Template.
This ID is immutable from user template updates:
- it is removed from the VNET template body on insert/update
- it is serialized as a top-level VNET attribute
- update operations use the stored value to validate VLAN authorization
A database migrator moves legacy TEMPLATE/TEMPLATE_ID values to top-level VNET/TEMPLATE_ID.
The tenant self-provisioning model for VNETs is based on controlled entry points:
- VNET reservations
- VN Template instantiation
Group VLAN authorization is enforced on VN Template instantiation and on updates to VNETs that were
instantiated from a VN Template.
Direct VNET allocation is not considered the tenant-facing self-provisioning path. It should remain
admin-controlled, as unrestricted VNET creation can expose other sensitive network attributes such
as PHYDEV, BRIDGE, and driver-specific configuration in addition to VLAN IDs.
Existing VNETs created from VN Templates may have the source template ID stored inside TEMPLATE/
TEMPLATE_ID. The migration step moves that value to top-level VNET/TEMPLATE_ID and removes it from
the template body.
This PR also updates the AR operations (add/del/update) so tenants can easily managed the VNET instantiations.
Existing directly-created VNETs will have no source VN Template and are treated as TEMPLATE_ID =
-1.
Existing group objects without VLAN rules are initialized with an empty VLAN_RULES section,
preserving current behavior until rules are explicitly configured.
Configuration compatibility:
- VLAN_ID, CVLANS, and AR/VLAN_ID are no longer expected to be handled through generic VNET
restricted attributes for the VN Template instantiation flow.
- OneCfg migration/update handling for configuration files will be addressed separately before
release.
co-authored-by: Pavel Czerny <pczerny@opennebula.io>
co-authored-by: Miguel E. Ruiz <mruiz@opennebula.io>
co-authored-by: dcarracedo <dcarracedo@opennebula.io>
292 lines
11 KiB
C++
292 lines
11 KiB
C++
/* ------------------------------------------------------------------------ */
|
|
/* Copyright 2002-2026, OpenNebula Project, OpenNebula Systems */
|
|
/* */
|
|
/* Licensed under the Apache License, Version 2.0 (the "License"); you may */
|
|
/* not use this file except in compliance with the License. You may obtain */
|
|
/* a copy of the License at */
|
|
/* */
|
|
/* http://www.apache.org/licenses/LICENSE-2.0 */
|
|
/* */
|
|
/* Unless required by applicable law or agreed to in writing, software */
|
|
/* distributed under the License is distributed on an "AS IS" BASIS, */
|
|
/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. */
|
|
/* See the License for the specific language governing permissions and */
|
|
/* limitations under the License. */
|
|
/* -------------------------------------------------------------------------*/
|
|
|
|
#ifndef ONE_DB_H_
|
|
#define ONE_DB_H_
|
|
|
|
// -----------------------------------------------------------------------------
|
|
// This file includes the SQL schema defintion for OpenNebula objects
|
|
// -----------------------------------------------------------------------------
|
|
namespace one_db
|
|
{
|
|
/* ---------------------------------------------------------------------- */
|
|
/* HOST TABLES */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * host_table;
|
|
|
|
extern const char * host_db_names;
|
|
|
|
extern const char * host_db_bootstrap;
|
|
|
|
extern const char * host_monitor_table;
|
|
|
|
extern const char * host_monitor_db_names;
|
|
|
|
extern const char * host_monitor_db_bootstrap;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* VM TABLES */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * vm_table;
|
|
|
|
extern const char * vm_db_names;
|
|
|
|
extern const char * vm_db_bootstrap;
|
|
|
|
extern const char * vm_monitor_table;
|
|
|
|
extern const char * vm_monitor_db_names;
|
|
|
|
extern const char * vm_monitor_db_bootstrap;
|
|
|
|
extern const char * vm_showback_table;
|
|
|
|
extern const char * vm_showback_db_names;
|
|
|
|
extern const char * vm_showback_db_bootstrap;
|
|
|
|
extern const char * vm_group_db_names;
|
|
|
|
extern const char * vm_group_db_bootstrap;
|
|
|
|
extern const char * vm_group_table;
|
|
|
|
extern const char * vm_template_db_names;
|
|
|
|
extern const char * vm_template_db_bootstrap;
|
|
|
|
extern const char * vm_template_table;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* Cluster tables */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * cluster_db_names;
|
|
extern const char * cluster_db_bootstrap;
|
|
extern const char * cluster_table;
|
|
|
|
extern const char * cluster_datastore_table;
|
|
extern const char * cluster_datastore_db_names;
|
|
extern const char * cluster_datastore_db_bootstrap;
|
|
|
|
extern const char * cluster_network_table;
|
|
extern const char * cluster_network_db_names;
|
|
extern const char * cluster_network_db_bootstrap;
|
|
|
|
extern const char * cluster_bitmap_table;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* Plan tables */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * plan_table;
|
|
extern const char * plan_db_names;
|
|
extern const char * plan_db_bootstrap;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* ACL tables */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * acl_table;
|
|
|
|
extern const char * acl_db_names;
|
|
|
|
extern const char * acl_db_bootstrap;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* Datastore tables */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * ds_db_names;
|
|
|
|
extern const char * ds_db_bootstrap;
|
|
|
|
extern const char * ds_table;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* Document tables */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * doc_db_names;
|
|
|
|
extern const char * doc_db_bootstrap;
|
|
|
|
extern const char * doc_table;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* Group tables */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * group_db_names;
|
|
|
|
extern const char * group_db_bootstrap;
|
|
|
|
extern const char * group_table;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* History tables */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * history_table;
|
|
|
|
extern const char * history_db_names;
|
|
|
|
extern const char * history_db_bootstrap;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* Hook tables */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * hook_db_names;
|
|
|
|
extern const char * hook_db_bootstrap;
|
|
|
|
extern const char * hook_table;
|
|
|
|
extern const char * hook_log_table;
|
|
|
|
extern const char * hook_log_db_names;
|
|
|
|
extern const char * hook_log_db_bootstrap;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* Image tables */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * image_db_names;
|
|
|
|
extern const char * image_db_bootstrap;
|
|
|
|
extern const char * image_table;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* Log tables */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * log_table;
|
|
|
|
extern const char * log_db_names;
|
|
|
|
extern const char * log_db_bootstrap;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* Marketplace tables */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * mp_db_names;
|
|
|
|
extern const char * mp_db_bootstrap;
|
|
|
|
extern const char * mp_table;
|
|
|
|
extern const char * mp_app_db_names;
|
|
|
|
extern const char * mp_app_db_bootstrap;
|
|
|
|
extern const char * mp_app_table;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* Quotas tables */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * group_quotas_db_names;
|
|
extern const char * group_quotas_db_bootstrap;
|
|
extern const char * group_quotas_db_table;
|
|
extern const char * group_quotas_db_oid_column;
|
|
|
|
extern const char * user_quotas_db_names;
|
|
extern const char * user_quotas_db_bootstrap;
|
|
extern const char * user_quotas_db_table;
|
|
extern const char * user_quotas_db_oid_column;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* Security Group tables */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * sg_db_names;
|
|
|
|
extern const char * sg_db_bootstrap;
|
|
|
|
extern const char * sg_table;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* User tables */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * user_db_names;
|
|
|
|
extern const char * user_db_bootstrap;
|
|
|
|
extern const char * user_table;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* VDC tables */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * vdc_db_names;
|
|
|
|
extern const char * vdc_db_bootstrap;
|
|
|
|
extern const char * vdc_table;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* Virtual Network tables */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * vn_table;
|
|
|
|
extern const char * vn_db_names;
|
|
|
|
extern const char * vn_db_bootstrap;
|
|
|
|
extern const char * vn_template_db_names;
|
|
|
|
extern const char * vn_template_db_bootstrap;
|
|
|
|
extern const char * vn_template_table;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* Virtual Router tables */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * vr_db_names;
|
|
|
|
extern const char * vr_db_bootstrap;
|
|
|
|
extern const char * vr_table;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* Zone tables */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * zone_db_names;
|
|
|
|
extern const char * zone_db_bootstrap;
|
|
|
|
extern const char * zone_table;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* Backup Job tables */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * backup_job_table;
|
|
|
|
extern const char * backup_job_db_names;
|
|
|
|
extern const char * backup_job_db_bootstrap;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* Scheduled Action tables */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * scheduled_action_table;
|
|
|
|
extern const char * scheduled_action_db_names;
|
|
|
|
extern const char * scheduled_action_db_bootstrap;
|
|
|
|
/* ---------------------------------------------------------------------- */
|
|
/* VLAN rules tables */
|
|
/* ---------------------------------------------------------------------- */
|
|
extern const char * group_vlans_db_names;
|
|
extern const char * group_vlans_db_bootstrap;
|
|
extern const char * group_vlans_db_table;
|
|
extern const char * group_vlans_db_oid_column;
|
|
}
|
|
|
|
|
|
#endif /*ONE_DB_H_*/
|