Skip to content

Commit

Permalink
Merge "Allowed address pair mac-address" into R2.20
Browse files Browse the repository at this point in the history
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed Feb 17, 2016
2 parents 224f773 + eed92a6 commit bed037b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/config/api-server/vnc_cfg_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ def http_post_collection(cls, tenant_name, obj_dict, db_conn):
aaps = aap_config['allowed_address_pair']
for aap in aaps or []:
if aap['mac'] == "":
aap['mac'] = obj_dict['virtual_machine_interface_mac_addresses']['mac_address']
aap['mac'] = obj_dict['virtual_machine_interface_mac_addresses']['mac_address'][0]
return True, ""
# end http_post_collection

Expand All @@ -415,7 +415,7 @@ def http_put(cls, id, fq_name, obj_dict, db_conn):
aaps = aap_config['allowed_address_pair']
for aap in aaps or []:
if aap['mac'] == "":
aap['mac'] = read_result['virtual_machine_interface_mac_addresses']['mac_address']
aap['mac'] = read_result['virtual_machine_interface_mac_addresses']['mac_address'][0]
return True, ""
# end http_put
# end class VirtualMachineInterfaceServer
Expand Down

0 comments on commit bed037b

Please sign in to comment.