Merge "Handle KeyError if aap json data is missing mac field" into R3.0

Juniper · Feb 25, 2016 · 241c8b1 · 241c8b1
2 parents f97ea9f + fdf14fa
commit 241c8b1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/config/api-server/vnc_cfg_types.py b/src/config/api-server/vnc_cfg_types.py
@@ -462,7 +462,7 @@ def pre_dbe_create(cls, tenant_name, obj_dict, db_conn):
         aap_config = obj_dict.get(
             'virtual_machine_interface_allowed_address_pairs', {})
         for aap in aap_config.get('allowed_address_pair', []):
-            if aap['mac'] == "":
+            if not aap.get('mac', None):
                 aap['mac'] = mac_addrs_dict['mac_address'][0]
 
         if 'virtual_machine_interface_bindings' in obj_dict:
@@ -548,7 +548,7 @@ def pre_dbe_update(cls, id, fq_name, obj_dict, db_conn,
         aap_config = obj_dict.get(
             'virtual_machine_interface_allowed_address_pairs', {})
         for aap in aap_config.get('allowed_address_pair', []):
-            if aap['mac'] == "":
+            if not aap.get('mac', None):
                 aap['mac'] = read_result[
                     'virtual_machine_interface_mac_addresses']['mac_address'][0]