diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-02-15 17:13:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-02-15 17:13:07 +0000 |
| commit | ab548e2e39daafb93ebcb4549a8dfe75c5b5ea94 (patch) | |
| tree | dbaad5b34326ee0c36baf19fb9760b3d6aa0608d /nova/db | |
| parent | 3c7a362763a6c6ba44570b61a1cc45d9a0f3abe4 (diff) | |
| parent | e88a2a616b6d3eda01ae739e542bec54ff82922f (diff) | |
| download | nova-ab548e2e39daafb93ebcb4549a8dfe75c5b5ea94.tar.gz nova-ab548e2e39daafb93ebcb4549a8dfe75c5b5ea94.tar.xz nova-ab548e2e39daafb93ebcb4549a8dfe75c5b5ea94.zip | |
Merge "Prevent Duplicate VLAN IDs"
Diffstat (limited to 'nova/db')
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index ed9286eff..1f4f2f88c 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -1984,9 +1984,16 @@ def network_count_reserved_ips(context, network_id): @require_admin_context def network_create_safe(context, values): + if values.get('vlan'): + if model_query(context, models.Network, read_deleted="no")\ + .filter_by(vlan=values['vlan'])\ + .first(): + raise exception.DuplicateVlan(vlan=values['vlan']) + network_ref = models.Network() network_ref['uuid'] = str(utils.gen_uuid()) network_ref.update(values) + try: network_ref.save() return network_ref |