Skip to content

Commit

Permalink
Merge "ST: Free route target using free_route_target instead of free_…
Browse files Browse the repository at this point in the history
…route_target_by_number Closes-Bug: 1764495" into R4.1
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed Apr 24, 2018
2 parents d5bbbcc + f03336e commit b264125
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 4 deletions.
2 changes: 1 addition & 1 deletion src/config/schema-transformer/config_db.py
Expand Up @@ -4160,7 +4160,7 @@ def delete_obj(self):
self.update_virtual_networks()
rtgt_num = int(self.route_target.split(':')[-1])
self.delete_route_targets([self.route_target])
self._object_db.free_route_target_by_number(rtgt_num)
self._object_db.free_route_target(self.name)
# end delete_obj

def update_virtual_networks(self):
Expand Down
3 changes: 0 additions & 3 deletions src/config/schema-transformer/db.py
Expand Up @@ -237,9 +237,6 @@ def alloc_route_target(self, ri_fq_name, zk_only=False):
return rtgt_num
# end alloc_route_target

def free_route_target_by_number(self, rtgt):
self._rt_allocator.delete(rtgt)

def free_route_target(self, ri_fq_name):
try:
rtgt = self.get_route_target(ri_fq_name)
Expand Down

0 comments on commit b264125

Please sign in to comment.