Skip to content

Commit

Permalink
Merge "[DM]: Fix for a traceback, return 'obj' was missing in PortTup…
Browse files Browse the repository at this point in the history
…le:update()" into R4.1
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed Oct 18, 2017
2 parents bba1fb4 + 559b25a commit 48a416a
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/config/device-manager/device_manager/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -1194,6 +1194,7 @@ def update(self, obj=None):
vmi_obj = VirtualMachineInterfaceDM.get(vmi)
if vmi_obj and not vmi_obj.service_instance:
vmi_obj.service_instance = self.parent_uuid
return obj
# end update

@classmethod
Expand Down

0 comments on commit 48a416a

Please sign in to comment.