Merge "compute: Prevent use of conflicting v*-fixed-ip for 'server create --nic'"

Author: Zuul

openstackclient/compute/v2/server.py

@@ -931,10 +931,17 @@ def __call__(self, parser, namespace, values, option_string=None):
 
         if info['net-id'] and info['port-id']:
             msg = _(
-                'Invalid argument %s; either network or port should be '
-                'specified but not both'
+                "Invalid argument %s; either 'network' or 'port' should be "
+                "specified but not both"
             )
-            raise argparse.ArgumenteError(self, msg % values)
+            raise argparse.ArgumentError(self, msg % values)
+
+        if info['v4-fixed-ip'] and info['v6-fixed-ip']:
+            msg = _(
+                "Invalid argument %s; either 'v4-fixed-ip' or 'v6-fixed-ip' "
+                "should be specified but not both"
+            )
+            raise argparse.ArgumentError(self, msg % values)
 
         getattr(namespace, self.dest).append(info)
 

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

@@ -2308,7 +2308,46 @@ def test_server_create_with_only_network_key(self):
             arglist,
             [],
         )
+        self.assertNotCalled(self.servers_mock.create)
 
+    def test_server_create_with_conflicting_net_port_filters(self):
+        arglist = [
+            '--image',
+            'image1',
+            '--flavor',
+            'flavor1',
+            '--nic',
+            'net-id=abc,port-id=xyz',
+            self.new_server.name,
+        ]
+        exc = self.assertRaises(
+            test_utils.ParserException,
+            self.check_parser,
+            self.cmd,
+            arglist,
+            [],
+        )
+        self.assertIn("either 'network' or 'port'", str(exc))
+        self.assertNotCalled(self.servers_mock.create)
+
+    def test_server_create_with_conflicting_fixed_ip_filters(self):
+        arglist = [
+            '--image',
+            'image1',
+            '--flavor',
+            'flavor1',
+            '--nic',
+            'net-id=abc,v4-fixed-ip=1.2.3.4,v6-fixed-ip=2001:db8:abcd',
+            self.new_server.name,
+        ]
+        exc = self.assertRaises(
+            test_utils.ParserException,
+            self.check_parser,
+            self.cmd,
+            arglist,
+            [],
+        )
+        self.assertIn("either 'v4-fixed-ip' or 'v6-fixed-ip'", str(exc))
         self.assertNotCalled(self.servers_mock.create)
 
     @mock.patch.object(common_utils, 'wait_for_status', return_value=True)