Merge "Remove beta label for network segment resource"

3 files changed, 6 insertions, 92 deletions

diff --git a/openstackclient/tests/functional/network/v2/test_network_segment.py b/openstackclient/tests/functional/network/v2/test_network_segment.py
index de5aef96..b6f19ac4 100644
--- a/openstackclient/tests/functional/network/v2/test_network_segment.py
+++ b/openstackclient/tests/functional/network/v2/test_network_segment.py
@@ -39,8 +39,7 @@ class NetworkSegmentTests(base.TestCase):
         if cls.NETWORK_SEGMENT_EXTENSION:
             # Get the segment for the network.
             opts = cls.get_opts(['ID', 'Network'])
-            raw_output = cls.openstack('--os-beta-command '
-                                       'network segment list '
+            raw_output = cls.openstack('network segment list '
                                        ' --network ' + cls.NETWORK_NAME +
                                        ' ' + opts)
             raw_output_row = raw_output.split('\n')[0]
@@ -55,14 +54,12 @@ class NetworkSegmentTests(base.TestCase):
         if self.NETWORK_SEGMENT_EXTENSION:
             opts = self.get_opts(['id'])
             raw_output = self.openstack(
-                '--os-beta-command' +
                 ' network segment create --network ' + self.NETWORK_ID +
                 ' --network-type geneve ' +
                 ' --segment 2055 test_segment ' + opts
             )
             network_segment_id = raw_output.strip('\n')
-            raw_output = self.openstack('--os-beta-command ' +
-                                        'network segment delete ' +
+            raw_output = self.openstack('network segment delete ' +
                                         network_segment_id)
             self.assertOutput('', raw_output)
         else:
@@ -71,8 +68,7 @@ class NetworkSegmentTests(base.TestCase):
     def test_network_segment_list(self):
         if self.NETWORK_SEGMENT_EXTENSION:
             opts = self.get_opts(['ID'])
-            raw_output = self.openstack('--os-beta-command '
-                                        'network segment list' + opts)
+            raw_output = self.openstack('network segment list' + opts)
             self.assertIn(self.NETWORK_SEGMENT_ID, raw_output)
         else:
             self.skipTest('Segment extension disabled')
@@ -80,14 +76,12 @@ class NetworkSegmentTests(base.TestCase):
     def test_network_segment_set(self):
         if self.NETWORK_SEGMENT_EXTENSION:
             new_description = 'new_description'
-            raw_output = self.openstack('--os-beta-command '
-                                        'network segment set ' +
+            raw_output = self.openstack('network segment set ' +
                                         '--description ' + new_description +
                                         ' ' + self.NETWORK_SEGMENT_ID)
             self.assertOutput('', raw_output)
             opts = self.get_opts(['description'])
-            raw_output = self.openstack('--os-beta-command '
-                                        'network segment show ' +
+            raw_output = self.openstack('network segment show ' +
                                         self.NETWORK_SEGMENT_ID + opts)
             self.assertEqual(new_description + "\n", raw_output)
         else:
@@ -96,8 +90,7 @@ class NetworkSegmentTests(base.TestCase):
     def test_network_segment_show(self):
         if self.NETWORK_SEGMENT_EXTENSION:
             opts = self.get_opts(['network_id'])
-            raw_output = self.openstack('--os-beta-command '
-                                        'network segment show ' +
+            raw_output = self.openstack('network segment show ' +
                                         self.NETWORK_SEGMENT_ID + opts)
             self.assertEqual(self.NETWORK_ID + "\n", raw_output)
         else:
diff --git a/openstackclient/tests/unit/network/v2/test_network_segment.py b/openstackclient/tests/unit/network/v2/test_network_segment.py
index 3e755e07..b9f0c3cf 100644
--- a/openstackclient/tests/unit/network/v2/test_network_segment.py
+++ b/openstackclient/tests/unit/network/v2/test_network_segment.py
@@ -26,9 +26,6 @@ class TestNetworkSegment(network_fakes.TestNetworkV2):
     def setUp(self):
         super(TestNetworkSegment, self).setUp()
 
-        # Enable beta commands.
-        self.app.options.os_beta_command = True
-
         # Get a shortcut to the network client
         self.network = self.app.client_manager.network
 
@@ -81,22 +78,6 @@ class TestCreateNetworkSegment(TestNetworkSegment):
         self.assertRaises(tests_utils.ParserException, self.check_parser,
                           self.cmd, [], [])
 
-    def test_create_no_beta_commands(self):
-        arglist = [
-            '--network', self._network_segment.network_id,
-            '--network-type', self._network_segment.network_type,
-            self._network_segment.name,
-        ]
-        verifylist = [
-            ('network', self._network_segment.network_id),
-            ('network_type', self._network_segment.network_type),
-            ('name', self._network_segment.name),
-        ]
-        self.app.options.os_beta_command = False
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.assertRaises(exceptions.CommandError, self.cmd.take_action,
-                          parsed_args)
-
     def test_create_invalid_network_type(self):
         arglist = [
             '--network', self._network_segment.network_id,
@@ -192,18 +173,6 @@ class TestDeleteNetworkSegment(TestNetworkSegment):
             self.namespace
         )
 
-    def test_delete_no_beta_commands(self):
-        arglist = [
-            self._network_segments[0].id,
-        ]
-        verifylist = [
-            ('network_segment', [self._network_segments[0].id]),
-        ]
-        self.app.options.os_beta_command = False
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.assertRaises(exceptions.CommandError, self.cmd.take_action,
-                          parsed_args)
-
     def test_delete(self):
         arglist = [
             self._network_segments[0].id,
@@ -330,12 +299,6 @@ class TestListNetworkSegment(TestNetworkSegment):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data, list(data))
 
-    def test_list_no_beta_commands(self):
-        self.app.options.os_beta_command = False
-        parsed_args = self.check_parser(self.cmd, [], [])
-        self.assertRaises(exceptions.CommandError, self.cmd.take_action,
-                          parsed_args)
-
     def test_list_long(self):
         arglist = [
             '--long',
@@ -391,18 +354,6 @@ class TestSetNetworkSegment(TestNetworkSegment):
         # Get the command object to test
         self.cmd = network_segment.SetNetworkSegment(self.app, self.namespace)
 
-    def test_set_no_beta_commands(self):
-        arglist = [
-            self._network_segment.id,
-        ]
-        verifylist = [
-            ('network_segment', self._network_segment.id),
-        ]
-        self.app.options.os_beta_command = False
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.assertRaises(exceptions.CommandError, self.cmd.take_action,
-                          parsed_args)
-
     def test_set_no_options(self):
         arglist = [
             self._network_segment.id,
@@ -485,18 +436,6 @@ class TestShowNetworkSegment(TestNetworkSegment):
         self.assertRaises(tests_utils.ParserException, self.check_parser,
                           self.cmd, [], [])
 
-    def test_show_no_beta_commands(self):
-        arglist = [
-            self._network_segment.id,
-        ]
-        verifylist = [
-            ('network_segment', self._network_segment.id),
-        ]
-        self.app.options.os_beta_command = False
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.assertRaises(exceptions.CommandError, self.cmd.take_action,
-                          parsed_args)
-
     def test_show_all_options(self):
         arglist = [
             self._network_segment.id,
diff --git a/openstackclient/tests/unit/network/v2/test_subnet.py b/openstackclient/tests/unit/network/v2/test_subnet.py
index 9c468f39..2d51aa4a 100644
--- a/openstackclient/tests/unit/network/v2/test_subnet.py
+++ b/openstackclient/tests/unit/network/v2/test_subnet.py
@@ -379,23 +379,6 @@ class TestCreateSubnet(TestSubnet):
         self.assertEqual(self.columns, columns)
         self.assertEqual(self.data_ipv6, data)
 
-    def test_create_no_beta_command_options(self):
-        arglist = [
-            "--subnet-range", self._subnet.cidr,
-            "--network-segment", self._network_segment.id,
-            "--network", self._subnet.network_id,
-            self._subnet.name,
-        ]
-        verifylist = [
-            ('name', self._subnet.name),
-            ('subnet_range', self._subnet.cidr),
-            ('network-segment', self._network_segment.id),
-            ('network', self._subnet.network_id),
-        ]
-        self.app.options.os_beta_command = False
-        self.assertRaises(tests_utils.ParserException,
-                          self.check_parser, self.cmd, arglist, verifylist)
-
     def test_create_with_network_segment(self):
         # Mock SDK calls for this test.
         self.network.create_subnet = mock.Mock(return_value=self._subnet)
@@ -417,7 +400,6 @@ class TestCreateSubnet(TestSubnet):
 
         ]
 
-        self.app.options.os_beta_command = True
         parsed_args = self.check_parser(self.cmd, arglist, verifylist)
         columns, data = self.cmd.take_action(parsed_args)