Skip to content

Commit

Permalink
[DM]: Do not assume vmi device_owner attribute is always set by api c…
Browse files Browse the repository at this point in the history
…lients

If not set, set it to ''. Also alow to have device owner attribute value can be PhysicalRouter or physical-router

Change-Id: I2ebef4d16ae8739a4d8a63b125b4aa880fb7d58e
Partial-Bug: #1646684
  • Loading branch information
sbalineni committed Dec 6, 2016
1 parent 5012aa1 commit 668e176
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/config/device-manager/device_manager/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -1039,7 +1039,7 @@ def update(self, obj=None):
self.params = obj['virtual_machine_interface_properties']
self.service_interface_type = self.params.get(
'service_interface_type', None)
self.device_owner = obj.get("virtual_machine_interface_device_owner")
self.device_owner = obj.get("virtual_machine_interface_device_owner") or ''
self.update_single_ref('logical_interface', obj)
self.update_single_ref('virtual_network', obj)
self.update_single_ref('floating_ip', obj)
Expand All @@ -1055,7 +1055,7 @@ def update(self, obj=None):
# end update

def is_device_owner_bms(self):
if self.logical_interface and self.device_owner.lower() == 'physicalrouter':
if self.logical_interface and self.device_owner.lower() in ['physicalrouter', 'physical-router']:
return True
return False
# end
Expand Down

0 comments on commit 668e176

Please sign in to comment.