From 7396bccace570b85206a595778044d21cddfe6ed Mon Sep 17 00:00:00 2001 From: Akash Gangil Date: Tue, 16 Aug 2016 07:09:23 -0700 Subject: [PATCH] Remove unused members arg frm add_router_link_port The members argument which was deinfed in add_router_link_port definition was not being used. This patch removes it and also cleans up unused code. Change-Id: Ia16ca4289c1521797edd06340a4a20745824b1ad --- vmware_nsx/nsxlib/v3/router.py | 3 +-- vmware_nsx/plugins/nsx_v3/plugin.py | 10 ++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/vmware_nsx/nsxlib/v3/router.py b/vmware_nsx/nsxlib/v3/router.py index a8f5e0da8d..346f450909 100644 --- a/vmware_nsx/nsxlib/v3/router.py +++ b/vmware_nsx/nsxlib/v3/router.py @@ -78,8 +78,7 @@ class RouterLib(object): 'edge_cluster_uuid': edge_cluster_uuid, 'member_index_list': member_index_list} - def add_router_link_port(self, tier1_uuid, tier0_uuid, edge_members, - tags): + def add_router_link_port(self, tier1_uuid, tier0_uuid, tags): # Create Tier0 logical router link port t0_tags = copy.copy(tags) t0_tags = utils.add_v3_tag(t0_tags, 'os-tier0-uuid', tier0_uuid) diff --git a/vmware_nsx/plugins/nsx_v3/plugin.py b/vmware_nsx/plugins/nsx_v3/plugin.py index c976cef8dc..567af613a6 100644 --- a/vmware_nsx/plugins/nsx_v3/plugin.py +++ b/vmware_nsx/plugins/nsx_v3/plugin.py @@ -541,11 +541,10 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin, return is_provider_net, net_type, physical_net, vlan_id - def _get_edge_cluster_and_members(self, tier0_uuid): + def _get_edge_cluster(self, tier0_uuid): self._routerlib.validate_tier0(self.tier0_groups_dict, tier0_uuid) tier0_info = self.tier0_groups_dict[tier0_uuid] - return (tier0_info['edge_cluster_uuid'], - tier0_info['member_index_list']) + return tier0_info['edge_cluster_uuid'] def _validate_external_net_create(self, net_data): is_provider_net = False @@ -2124,15 +2123,14 @@ class NsxV3Plugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin, nsx_router_id, org_tier0_uuid) if add_router_link_port: # First update edge cluster info for router - edge_cluster_uuid, members = self._get_edge_cluster_and_members( - new_tier0_uuid) + edge_cluster_uuid = self._get_edge_cluster(new_tier0_uuid) self._routerlib.update_router_edge_cluster( nsx_router_id, edge_cluster_uuid) tags = utils.build_v3_tags_payload( router, resource_type='os-neutron-rport', project_name=context.tenant_name) self._routerlib.add_router_link_port(nsx_router_id, new_tier0_uuid, - members, tags=tags) + tags=tags) if add_snat_rules: self._routerlib.add_gw_snat_rule(nsx_router_id, newaddr) if bgp_announce: