From e88a2a616b6d3eda01ae739e542bec54ff82922f Mon Sep 17 00:00:00 2001
From: Andrew Clay Shafer <acs@parvuscaptus.com>
Date: Tue, 14 Feb 2012 01:44:37 -0500
Subject: Prevent Duplicate VLAN IDs

Addresses Bug 708278

Add check for duplicates in api.py
Add DuplicateVlan to exception.py
Add test to raise DuplicateVlan in test_db_api.py
Add to Authors

Change-Id: I9d68d7b7c886071e38df3c9d7d53724758bdd84c
---
 nova/db/sqlalchemy/api.py | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'nova/db')

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
-- 
cgit