From a7975c42003d7df2af91154007435cd5f8560f24 Mon Sep 17 00:00:00 2001
From: Stephen Finucane <sfinucan@redhat.com>
Date: Wed, 26 Oct 2022 13:24:30 +0300
Subject: compute: Add '--no-network', '--auto-network' flags

These are aliases for '--nic none' and '--nic auto', respectively.

Change-Id: I7b4f7e5c3769a813bd8b2b9cd6090c6fe501e13d
Signed-off-by: Stephen Finucane <sfinucan@redhat.com>
---
 .../tests/unit/compute/v2/test_server.py           | 58 ++++++++++++++++------
 1 file changed, 44 insertions(+), 14 deletions(-)

(limited to 'openstackclient/tests/unit')

diff --git a/openstackclient/tests/unit/compute/v2/test_server.py b/openstackclient/tests/unit/compute/v2/test_server.py
index 2e64e071..f4fd44b1 100644
--- a/openstackclient/tests/unit/compute/v2/test_server.py
+++ b/openstackclient/tests/unit/compute/v2/test_server.py
@@ -1900,13 +1900,7 @@ class TestServerCreate(TestServer):
         self.assertRaises(
             exceptions.CommandError, self.cmd.take_action, parsed_args)
 
-    def test_server_create_with_auto_network(self):
-        arglist = [
-            '--image', 'image1',
-            '--flavor', 'flavor1',
-            '--nic', 'auto',
-            self.new_server.name,
-        ]
+    def _test_server_create_with_auto_network(self, arglist):
         verifylist = [
             ('image', 'image1'),
             ('flavor', 'flavor1'),
@@ -1946,6 +1940,27 @@ class TestServerCreate(TestServer):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.datalist(), data)
 
+    # NOTE(stephenfin): '--auto-network' is an alias for '--nic auto' so the
+    # tests are nearly identical
+
+    def test_server_create_with_auto_network_legacy(self):
+        arglist = [
+            '--image', 'image1',
+            '--flavor', 'flavor1',
+            '--nic', 'auto',
+            self.new_server.name,
+        ]
+        self._test_server_create_with_auto_network(arglist)
+
+    def test_server_create_with_auto_network(self):
+        arglist = [
+            '--image', 'image1',
+            '--flavor', 'flavor1',
+            '--auto-network',
+            self.new_server.name,
+        ]
+        self._test_server_create_with_auto_network(arglist)
+
     def test_server_create_with_auto_network_default_v2_37(self):
         """Tests creating a server without specifying --nic using 2.37."""
         arglist = [
@@ -1996,13 +2011,7 @@ class TestServerCreate(TestServer):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.datalist(), data)
 
-    def test_server_create_with_none_network(self):
-        arglist = [
-            '--image', 'image1',
-            '--flavor', 'flavor1',
-            '--nic', 'none',
-            self.new_server.name,
-        ]
+    def _test_server_create_with_none_network(self, arglist):
         verifylist = [
             ('image', 'image1'),
             ('flavor', 'flavor1'),
@@ -2042,6 +2051,27 @@ class TestServerCreate(TestServer):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.datalist(), data)
 
+    # NOTE(stephenfin): '--no-network' is an alias for '--nic none' so the
+    # tests are nearly identical
+
+    def test_server_create_with_none_network_legacy(self):
+        arglist = [
+            '--image', 'image1',
+            '--flavor', 'flavor1',
+            '--nic', 'none',
+            self.new_server.name,
+        ]
+        self._test_server_create_with_none_network(arglist)
+
+    def test_server_create_with_none_network(self):
+        arglist = [
+            '--image', 'image1',
+            '--flavor', 'flavor1',
+            '--no-network',
+            self.new_server.name,
+        ]
+        self._test_server_create_with_none_network(arglist)
+
     def test_server_create_with_conflict_network_options(self):
         arglist = [
             '--image', 'image1',
-- 
cgit v1.2.1