BGPVPN: Fix resource comparison

Vinetos · Vinetos · commit cb9aae55c83c · 2024-05-06T14:22:08.000Z
This patch updates the resource comparison to accurately differentiate
between the manipulation of networks, ports, and router associations.
Introduced in I84fe4bb45d24c2f4a7a0246e2b9fb50354a715e0, the previous
implementation contained incorrect variable names, leading to
inconsistent results. This fix ensures that each resource type is
properly identified during comparison.

Closes-Bug: #2064286
Change-Id: Ieb87174296240f8f76ec10b39007935545b1bd3f
diff --git a/neutronclient/osc/v2/networking_bgpvpn/resource_association.py b/neutronclient/osc/v2/networking_bgpvpn/resource_association.py
@@ -75,10 +75,10 @@ def take_action(self, parsed_args):
             body.update(
                 arg2body(bgpvpn['id'], parsed_args))
 
-        if self._assoc_res_name == constants.NETWORK_ASSOC:
+        if self._resource == constants.NETWORK_ASSOC:
             obj = client.create_bgpvpn_network_association(
                 bgpvpn['id'], **body)
-        elif self._assoc_res_name == constants.PORT_ASSOCS:
+        elif self._resource == constants.PORT_ASSOC:
             obj = client.create_bgpvpn_port_association(bgpvpn['id'], **body)
         else:
             obj = client.create_bgpvpn_router_association(
@@ -123,10 +123,10 @@ def take_action(self, parsed_args):
         arg2body = getattr(self, '_args2body', None)
         if callable(arg2body):
             body = arg2body(bgpvpn['id'], parsed_args)
-            if self._assoc_res_name == constants.NETWORK_ASSOC:
+            if self._resource == constants.NETWORK_ASSOC:
                 client.update_bgpvpn_network_association(
                     bgpvpn['id'], parsed_args.resource_association_id, **body)
-            elif self._assoc_res_name == constants.PORT_ASSOCS:
+            elif self._resource == constants.PORT_ASSOC:
                 client.update_bgpvpn_port_association(
                     bgpvpn['id'], parsed_args.resource_association_id, **body)
             else:
@@ -165,9 +165,9 @@ def take_action(self, parsed_args):
         fails = 0
         for id in parsed_args.resource_association_ids:
             try:
-                if self._assoc_res_name == constants.NETWORK_ASSOC:
+                if self._resource == constants.NETWORK_ASSOC:
                     client.delete_bgpvpn_network_association(bgpvpn['id'], id)
-                elif self._assoc_res_name == constants.PORT_ASSOCS:
+                elif self._resource == constants.PORT_ASSOC:
                     client.delete_bgpvpn_port_association(bgpvpn['id'], id)
                 else:
                     client.delete_bgpvpn_router_association(bgpvpn['id'], id)
@@ -221,10 +221,10 @@ def take_action(self, parsed_args):
         params = {}
         if parsed_args.property:
             params.update(parsed_args.property)
-        if self._assoc_res_name == constants.NETWORK_ASSOC:
+        if self._resource == constants.NETWORK_ASSOC:
             objs = client.bgpvpn_network_associations(
                 bgpvpn['id'], retrieve_all=True, **params)
-        elif self._assoc_res_name == constants.PORT_ASSOCS:
+        elif self._resource == constants.PORT_ASSOC:
             objs = client.bgpvpn_port_associations(
                 bgpvpn['id'], retrieve_all=True, **params)
         else:
@@ -265,10 +265,10 @@ def get_parser(self, prog_name):
     def take_action(self, parsed_args):
         client = self.app.client_manager.network
         bgpvpn = client.find_bgpvpn(parsed_args.bgpvpn)
-        if self._assoc_res_name == constants.NETWORK_ASSOC:
+        if self._resource == constants.NETWORK_ASSOC:
             obj = client.get_bgpvpn_network_association(
                 bgpvpn['id'], parsed_args.resource_association_id)
-        elif self._assoc_res_name == constants.PORT_ASSOCS:
+        elif self._resource == constants.PORT_ASSOC:
             obj = client.get_bgpvpn_port_association(
                 bgpvpn['id'], parsed_args.resource_association_id)
         else:
