network: Prefer --agent-id to --long

Currently, if a user specifies both the --long and --agent-id args to
network list, the latter will be ignored. Invert this, since --long is
only a formatting option.

Change-Id: I53564c6258ca7c274288d3c0a428cc2c4307f72d
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

Author: stephenfin

openstackclient/network/v2/network.py

@@ -576,7 +576,15 @@ def take_action(
                 'Availability Zones',
                 'Tags',
             )
-        elif parsed_args.agent_id:
+        else:
+            columns = ('id', 'name', 'subnet_ids')
+            column_headers = (
+                'ID',
+                'Name',
+                'Subnets',
+            )
+
+        if parsed_args.agent_id:
             columns = ('id', 'name', 'subnet_ids')
             column_headers = (
                 'ID',
@@ -598,13 +606,6 @@ def take_action(
                     for s in data
                 ),
             )
-        else:
-            columns = ('id', 'name', 'subnet_ids')
-            column_headers = (
-                'ID',
-                'Name',
-                'Subnets',
-            )
 
         args = {}