Skip to content

Commit

Permalink
Merge "DM: fix for properly idetifying VMI ownership" into R3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed Jun 24, 2016
2 parents d7898b6 + 025b63e commit f95b243
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions src/config/device-manager/device_manager/db.py
Expand Up @@ -1019,7 +1019,6 @@ 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.update_single_ref('logical_interface', obj)
self.update_single_ref('virtual_network', obj)
self.update_single_ref('floating_ip', obj)
Expand All @@ -1035,8 +1034,7 @@ def update(self, obj=None):
# end update

def is_device_owner_bms(self):
if (not self.device_owner or
self.device_owner.lower() == 'physicalrouter'):
if self.logical_interface:
return True
return False
# end
Expand Down

0 comments on commit f95b243

Please sign in to comment.