Merge "compute: Fix '--network none/auto' handling"

Author: Zuul

openstackclient/compute/v2/server.py

@@ -721,11 +721,6 @@ def __call__(self, parser, namespace, values, option_string=None):
         if getattr(namespace, self.dest, None) is None:
             setattr(namespace, self.dest, [])
 
-        # Handle the special auto/none cases
-        if values in ('auto', 'none'):
-            getattr(namespace, self.dest).append(values)
-            return
-
         if self.key:
             if ',' in values or '=' in values:
                 msg = _(
@@ -735,6 +730,12 @@ def __call__(self, parser, namespace, values, option_string=None):
                 raise argparse.ArgumentTypeError(msg % values)
 
             values = '='.join([self.key, values])
+        else:
+            # Handle the special auto/none cases but only when a key isn't set
+            # (otherwise those could be valid values for the key)
+            if values in ('auto', 'none'):
+                getattr(namespace, self.dest).append(values)
+                return
 
         # We don't include 'tag' here by default since that requires a
         # particular microversion

openstackclient/tests/unit/compute/v2/test_server.py

@@ -1675,6 +1675,7 @@ def test_server_create_with_network(self):
             '--nic', 'net-id=net1,v4-fixed-ip=10.0.0.2',
             '--port', 'port1',
             '--network', 'net1',
+            '--network', 'auto',  # this is a network called 'auto'
             '--nic', 'port-id=port2',
             self.new_server.name,
         ]
@@ -1683,24 +1684,40 @@ def test_server_create_with_network(self):
             ('flavor', 'flavor1'),
             ('nics', [
                 {
-                    'net-id': 'net1', 'port-id': '',
-                    'v4-fixed-ip': '', 'v6-fixed-ip': '',
+                    'net-id': 'net1',
+                    'port-id': '',
+                    'v4-fixed-ip': '',
+                    'v6-fixed-ip': '',
                 },
                 {
-                    'net-id': 'net1', 'port-id': '',
-                    'v4-fixed-ip': '10.0.0.2', 'v6-fixed-ip': '',
+                    'net-id': 'net1',
+                    'port-id': '',
+                    'v4-fixed-ip': '10.0.0.2',
+                    'v6-fixed-ip': '',
                 },
                 {
-                    'net-id': '', 'port-id': 'port1',
-                    'v4-fixed-ip': '', 'v6-fixed-ip': '',
+                    'net-id': '',
+                    'port-id': 'port1',
+                    'v4-fixed-ip': '',
+                    'v6-fixed-ip': '',
                 },
                 {
-                    'net-id': 'net1', 'port-id': '',
-                    'v4-fixed-ip': '', 'v6-fixed-ip': '',
+                    'net-id': 'net1',
+                    'port-id': '',
+                    'v4-fixed-ip': '',
+                    'v6-fixed-ip': '',
                 },
                 {
-                    'net-id': '', 'port-id': 'port2',
-                    'v4-fixed-ip': '', 'v6-fixed-ip': '',
+                    'net-id': 'auto',
+                    'port-id': '',
+                    'v4-fixed-ip': '',
+                    'v6-fixed-ip': '',
+                },
+                {
+                    'net-id': '',
+                    'port-id': 'port2',
+                    'v4-fixed-ip': '',
+                    'v6-fixed-ip': '',
                 },
             ]),
             ('config_drive', False),
@@ -1729,12 +1746,16 @@ def test_server_create_with_network(self):
                                   "port2": port2_resource}[port_id])
 
         # Mock sdk APIs.
-        _network = mock.Mock(id='net1_uuid')
+        _network_1 = mock.Mock(id='net1_uuid')
+        _network_auto = mock.Mock(id='auto_uuid')
         _port1 = mock.Mock(id='port1_uuid')
         _port2 = mock.Mock(id='port2_uuid')
         find_network = mock.Mock()
         find_port = mock.Mock()
-        find_network.return_value = _network
+        find_network.side_effect = lambda net_id, ignore_missing: {
+            "net1": _network_1,
+            "auto": _network_auto,
+        }[net_id]
         find_port.side_effect = (lambda port_id, ignore_missing:
                                  {"port1": _port1,
                                   "port2": _port2}[port_id])
@@ -1775,6 +1796,10 @@ def test_server_create_with_network(self):
                    'v4-fixed-ip': '',
                    'v6-fixed-ip': '',
                    'port-id': ''},
+                  {'net-id': 'auto_uuid',
+                   'v4-fixed-ip': '',
+                   'v6-fixed-ip': '',
+                   'port-id': ''},
                   {'net-id': '',
                    'v4-fixed-ip': '',
                    'v6-fixed-ip': '',