python-openstackclient 7.1.4__py3-none-any.whl → 7.1.5__py3-none-any.whl

openstackclient/compute/v2/server.py

@@ -701,7 +701,10 @@ class AddServerSecurityGroup(command.Command):
             security_group = compute_v2.find_security_group(
                 compute_client, parsed_args.group
             )['name']
-        compute_client.add_security_group_to_server(server, security_group)
+        compute_client.add_security_group_to_server(
+            server,
+            {'name': security_group},
+        )
 
 
 class AddServerVolume(command.ShowOne):
@@ -4039,7 +4042,8 @@ class RemoveServerSecurityGroup(command.Command):
                 compute_client, parsed_args.group
             )['name']
         compute_client.remove_security_group_from_server(
-            server, security_group
+            server,
+            {'name': security_group},
         )
 
 

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

@@ -1295,7 +1295,7 @@ class ServerTests(common.ComputeTestCase):
             )
             if ip_address in cmd_output['addresses']['private']:
                 # Hang out for a bit and try again
-                print('retrying add port check')
+                print('retrying remove port check')
                 wait_time += 10
                 time.sleep(10)
             else:
@@ -1367,6 +1367,92 @@ class ServerTests(common.ComputeTestCase):
         addresses = cmd_output['addresses']['private']
         self.assertIn(ip_address, addresses)
 
+    def test_server_add_remove_security_group(self):
+        name = uuid.uuid4().hex
+        cmd_output = self.openstack(
+            'server create '
+            + '--network private '
+            + '--flavor '
+            + self.flavor_name
+            + ' '
+            + '--image '
+            + self.image_name
+            + ' '
+            + '--wait '
+            + name,
+            parse_output=True,
+        )
+
+        self.assertIsNotNone(cmd_output['id'])
+        self.assertEqual(name, cmd_output['name'])
+        self.addCleanup(self.openstack, 'server delete --wait ' + name)
+
+        # create security group
+        security_group_name = uuid.uuid4().hex
+
+        cmd_output = self.openstack(
+            'security group list',
+            parse_output=True,
+        )
+        self.assertNotIn(security_group_name, cmd_output)
+
+        cmd_output = self.openstack(
+            'security group create ' + security_group_name,
+            parse_output=True,
+        )
+        self.assertIsNotNone(cmd_output['id'])
+        self.addCleanup(
+            self.openstack, 'security group delete ' + security_group_name
+        )
+
+        # add security group to server, assert the name of the security group
+        # appears
+        self.openstack(
+            'server add security group ' + name + ' ' + security_group_name
+        )
+
+        wait_time = 0
+        while wait_time < 60:
+            cmd_output = self.openstack(
+                'server show ' + name,
+                parse_output=True,
+            )
+            if security_group_name not in [
+                x['name'] for x in cmd_output['security_groups']
+            ]:
+                # Hang out for a bit and try again
+                print('retrying add security group check')
+                wait_time += 10
+                time.sleep(10)
+            else:
+                break
+        security_groups = [x['name'] for x in cmd_output['security_groups']]
+        self.assertIn(security_group_name, security_groups)
+
+        # remove security group, assert the name of the security group doesn't
+        # appear
+        self.openstack(
+            'server remove security group ' + name + ' ' + security_group_name
+        )
+
+        wait_time = 0
+        while wait_time < 60:
+            cmd_output = self.openstack(
+                'server show ' + name,
+                parse_output=True,
+            )
+            if security_group_name not in [
+                x['name'] for x in cmd_output['security_groups']
+            ]:
+                # Hang out for a bit and try again
+                print('retrying remove security group check')
+                wait_time += 10
+                time.sleep(10)
+            else:
+                break
+        security_groups = [x['name'] for x in cmd_output['security_groups']]
+        self.assertNotIn(security_group_name, security_groups)
+
     def test_server_add_remove_volume(self):
         volume_wait_for = volume_common.BaseVolumeTests.wait_for_status
 

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

@@ -1186,7 +1186,7 @@ class TestServerAddSecurityGroup(compute_fakes.TestComputev2):
             self.server.id, ignore_missing=False
         )
         self.compute_sdk_client.add_security_group_to_server.assert_called_once_with(
-            self.server, 'fake_sg'
+            self.server, {'name': 'fake_sg'}
         )
         mock_find_nova_net_sg.assert_called_once_with(
             self.compute_sdk_client, 'fake_sg'
@@ -1207,7 +1207,7 @@ class TestServerAddSecurityGroup(compute_fakes.TestComputev2):
             self.server.id, ignore_missing=False
         )
         self.compute_sdk_client.add_security_group_to_server.assert_called_once_with(
-            self.server, 'fake_sg'
+            self.server, {'name': 'fake_sg'}
         )
         self.assertIsNone(result)
 
@@ -7394,7 +7394,7 @@ class TestServerRemoveSecurityGroup(TestServer):
             self.server.id, ignore_missing=False
         )
         self.compute_sdk_client.remove_security_group_from_server.assert_called_once_with(
-            self.server, 'fake_sg'
+            self.server, {'name': 'fake_sg'}
         )
         mock_find_nova_net_sg.assert_called_once_with(
             self.compute_sdk_client, 'fake_sg'
@@ -7415,7 +7415,7 @@ class TestServerRemoveSecurityGroup(TestServer):
             self.server.id, ignore_missing=False
         )
         self.compute_sdk_client.remove_security_group_from_server.assert_called_once_with(
-            self.server, 'fake_sg'
+            self.server, {'name': 'fake_sg'}
         )
         self.assertIsNone(result)
 

{python_openstackclient-7.1.4.dist-info → python_openstackclient-7.1.5.dist-info}/METADATA

@@ -1,12 +1,10 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python-openstackclient
-Version: 7.1.4
+Version: 7.1.5
 Summary: OpenStack Command-line Client
 Home-page: https://docs.openstack.org/python-openstackclient/latest/
 Author: OpenStack
 Author-email: openstack-discuss@lists.openstack.org
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Environment :: OpenStack
 Classifier: Intended Audience :: Information Technology
 Classifier: Intended Audience :: System Administrators
@@ -20,17 +18,28 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.8
-Requires-Dist: cliff (>=3.5.0)
-Requires-Dist: cryptography (>=2.7)
-Requires-Dist: iso8601 (>=0.1.11)
-Requires-Dist: openstacksdk (>=3.3.0)
-Requires-Dist: osc-lib (>=2.3.0)
-Requires-Dist: oslo.i18n (>=3.15.3)
-Requires-Dist: pbr (!=2.1.0,>=2.0.0)
-Requires-Dist: python-cinderclient (>=3.3.0)
-Requires-Dist: python-keystoneclient (>=3.22.0)
-Requires-Dist: requests (>=2.27.0)
-Requires-Dist: stevedore (>=2.0.1)
+License-File: LICENSE
+License-File: AUTHORS
+Requires-Dist: pbr!=2.1.0,>=2.0.0
+Requires-Dist: cryptography>=2.7
+Requires-Dist: cliff>=3.5.0
+Requires-Dist: iso8601>=0.1.11
+Requires-Dist: openstacksdk>=3.3.0
+Requires-Dist: osc-lib>=2.3.0
+Requires-Dist: oslo.i18n>=3.15.3
+Requires-Dist: python-keystoneclient>=3.22.0
+Requires-Dist: python-cinderclient>=3.3.0
+Requires-Dist: requests>=2.27.0
+Requires-Dist: stevedore>=2.0.1
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 ========================
 Team and repository tags
@@ -171,5 +180,3 @@ Authentication using username/password is most commonly used:
 If a password is not provided above (in plaintext), you will be interactively
 prompted to provide one securely.
 
-
-

{python_openstackclient-7.1.4.dist-info → python_openstackclient-7.1.5.dist-info}/RECORD

@@ -30,7 +30,7 @@ openstackclient/compute/v2/host.py,sha256=1Ow4eJu9HPz-SC0u_eXJskUXaGoyW7X1O2yZIf
 openstackclient/compute/v2/hypervisor.py,sha256=xkSLqZjaJnVABAKh9ANF9zqy67WaEJeD9NiVL3Frqko,8808
 openstackclient/compute/v2/hypervisor_stats.py,sha256=Y2Jkkleha8PXnM2VQ2MJtjKxHKchGRyEqmILfPj-Wgw,2161
 openstackclient/compute/v2/keypair.py,sha256=yM30AVsMmPP1SAqD8_nKXNkeB9WLyL6sd18AjeYIuhM,15730
-openstackclient/compute/v2/server.py,sha256=qzozAjygKLZUQ4Dtib1R1_10Sc7zm3axBCP3wt9d3Zw,187204
+openstackclient/compute/v2/server.py,sha256=k6GEzWM98DzV6RTJw_9i4iFFsCfDJD4ii9-ow-ca-P8,187272
 openstackclient/compute/v2/server_backup.py,sha256=GVf_T5iHt0po1vYDDQgUQ_fN3AisHvKozEXY37voWkc,4119
 openstackclient/compute/v2/server_event.py,sha256=vLtu_LBJ99Fgfj9oRBCVATalRMyqBd3CUjHToVfQB48,10055
 openstackclient/compute/v2/server_group.py,sha256=s9CjDnmjNUk03VUdAkOn5QHMoSCHV8dtvuLe05ER4Rg,8674
@@ -159,7 +159,7 @@ openstackclient/tests/functional/compute/v2/test_aggregate.py,sha256=7KQfDWDM2Tq
 openstackclient/tests/functional/compute/v2/test_flavor.py,sha256=2-dVzVvXsNSMDsTBzDuo3Rv79asExWC7wURudSld1iw,7452
 openstackclient/tests/functional/compute/v2/test_hypervisor.py,sha256=w9iH5k5__R3saIWPl7N6kXT9xRfTykrQEBKoaS2gSnE,1923
 openstackclient/tests/functional/compute/v2/test_keypair.py,sha256=9DiQz6_eNPOYQc6iFyraW8AZOhKsWplsfHpXy0ia8qY,7116
-openstackclient/tests/functional/compute/v2/test_server.py,sha256=k1bWgR1eN3AmImXMDG4tsXanGC0AcPROMe1rcypi4iI,51618
+openstackclient/tests/functional/compute/v2/test_server.py,sha256=MBg-R-k0wqcRkgUX2GEL-u5KdxewcbiSRAw6XCvJslQ,54495
 openstackclient/tests/functional/compute/v2/test_server_event.py,sha256=8MhH2tEJ4MrYW20UQOxKkFdZe0346nIRlz7wbCLXKxI,5157
 openstackclient/tests/functional/compute/v2/test_server_group.py,sha256=Bd46q5DDFHXCUInzT0Kbe0fmArW73VxEt4tQStRA-iE,3062
 openstackclient/tests/functional/identity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -294,7 +294,7 @@ openstackclient/tests/unit/compute/v2/test_host.py,sha256=AAcIxoGpVdy1qOkV3lPFyD
 openstackclient/tests/unit/compute/v2/test_hypervisor.py,sha256=t_Xv7uh4dzv6G-gOG3Eoy7l516cHOwy1xeiBgIyaUKc,17390
 openstackclient/tests/unit/compute/v2/test_hypervisor_stats.py,sha256=1z8Jhx_CBoN-cu4im3MQc-YPAZlRQfu--3c9UAUmMG4,3020
 openstackclient/tests/unit/compute/v2/test_keypair.py,sha256=ASoemn6bN_tEKZlHRbhUpjPNydPaqMA22jn6fyAcwGs,25067
-openstackclient/tests/unit/compute/v2/test_server.py,sha256=Lg2sSCAI9Cenb4xz1hoOwheQul7KxiEhJvXKHdg2rzA,310893
+openstackclient/tests/unit/compute/v2/test_server.py,sha256=aoNHY-W6TeV1VU7UaisrC8qql8rTsp5C5buQ-pJ0-H8,310933
 openstackclient/tests/unit/compute/v2/test_server_backup.py,sha256=MW2UQQ32cE403Bmihp7s_MYVhVV4NrkwfDdaZ-y5Wu4,7503
 openstackclient/tests/unit/compute/v2/test_server_event.py,sha256=aZhLD_RgcNDUdCgwVJmpolQlabVWxlrp5edSZBanR_Q,12504
 openstackclient/tests/unit/compute/v2/test_server_group.py,sha256=Ul0SQ_cIq4mW7TIsm6mDRtCOlboNyy6lClP1Oy3NPAE,14934
@@ -493,11 +493,11 @@ openstackclient/volume/v3/volume_message.py,sha256=HBBxPEcYoNqGjEbzGIEnIJ1XTcQ2K
 openstackclient/volume/v3/volume_snapshot.py,sha256=pZ4q_qCwqh4jaGhX28G59wsWDmEc3uXdbpeD176osZg,3186
 openstackclient/volume/v3/volume_transfer_request.py,sha256=PthOJV2m-pTV1njFzwTpaekXZkET1c6alIJrpuN7R6Q,7530
 openstackclient/volume/v3/volume_type.py,sha256=DF2MVoW2mIk0ABDLZD8D2sb8JlR7-rRjA4qCnBHRe6o,34039
-python_openstackclient-7.1.4.dist-info/AUTHORS,sha256=TRFKS0fs1j9d3_KWaIQfYnNH3gfTnDyBHng0RJAUFeM,21384
-python_openstackclient-7.1.4.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
-python_openstackclient-7.1.4.dist-info/METADATA,sha256=kgsnQMio_eekeFp0wbbLQ1k9JiLJmyUnkzCFkhqaLs4,6581
-python_openstackclient-7.1.4.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-python_openstackclient-7.1.4.dist-info/entry_points.txt,sha256=9kVhKTeyLPfkXDMI_ALqXvz0zSJEqibJLHHsOdmtT3c,53261
-python_openstackclient-7.1.4.dist-info/pbr.json,sha256=Ath0K2qvjbVogYTdeuTmNoMRajUIwhHfhz_eJUkQVOM,47
-python_openstackclient-7.1.4.dist-info/top_level.txt,sha256=htg7z9oZgysRuVUHn-m1Bk6XLGOeV65nMbZX9H8qhs0,16
-python_openstackclient-7.1.4.dist-info/RECORD,,
+python_openstackclient-7.1.5.dist-info/licenses/AUTHORS,sha256=TRFKS0fs1j9d3_KWaIQfYnNH3gfTnDyBHng0RJAUFeM,21384
+python_openstackclient-7.1.5.dist-info/licenses/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
+python_openstackclient-7.1.5.dist-info/METADATA,sha256=fmv-QoucuGzPHr8JFTkAH3h5EkM7OWsX5b5KAL7I3vU,6740
+python_openstackclient-7.1.5.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+python_openstackclient-7.1.5.dist-info/entry_points.txt,sha256=VsZCw-6So3hkHuIiX-dGaMVL1PEqmfDynF37m1EwjCs,53260
+python_openstackclient-7.1.5.dist-info/pbr.json,sha256=UhLx127tuigXv-CFTmYy9R7GRr1HsjkJKYtQJnfqOow,47
+python_openstackclient-7.1.5.dist-info/top_level.txt,sha256=htg7z9oZgysRuVUHn-m1Bk6XLGOeV65nMbZX9H8qhs0,16
+python_openstackclient-7.1.5.dist-info/RECORD,,

{python_openstackclient-7.1.4.dist-info → python_openstackclient-7.1.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.34.2)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{python_openstackclient-7.1.4.dist-info → python_openstackclient-7.1.5.dist-info}/entry_points.txt

@@ -715,4 +715,3 @@ volume_type_set = openstackclient.volume.v3.volume_type:SetVolumeType
 volume_type_show = openstackclient.volume.v3.volume_type:ShowVolumeType
 volume_type_unset = openstackclient.volume.v3.volume_type:UnsetVolumeType
 volume_unset = openstackclient.volume.v3.volume:UnsetVolume
-

python_openstackclient-7.1.5.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "67f5509f", "is_release": true}

python_openstackclient-7.1.4.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "f42ade43", "is_release": true}