diff options
| author | Zuul <zuul@review.opendev.org> | 2021-11-30 19:08:01 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-11-30 19:08:01 +0000 |
| commit | d9ad0b5d46d7b81ff564e8a1ea33ebeec212d7f7 (patch) | |
| tree | 12f99951156b60bbe417b3fd5eb464626c89be8b /openstackclient/compute | |
| parent | e02fd2ab183806c951cb78ffa1ee40570f8e77b9 (diff) | |
| parent | f82afc7f379daebd1994d9133eff801f790c0d32 (diff) | |
| download | python-openstackclient-d9ad0b5d46d7b81ff564e8a1ea33ebeec212d7f7.tar.gz | |
Merge "Switch openstack server remove port/network to using sdk"
Diffstat (limited to 'openstackclient/compute')
| -rw-r--r-- | openstackclient/compute/v2/server.py | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/openstackclient/compute/v2/server.py b/openstackclient/compute/v2/server.py index 5d9f5ab5..c2c4483f 100644 --- a/openstackclient/compute/v2/server.py +++ b/openstackclient/compute/v2/server.py @@ -3709,10 +3709,10 @@ class RemovePort(command.Command): return parser def take_action(self, parsed_args): - compute_client = self.app.client_manager.compute + compute_client = self.app.client_manager.sdk_connection.compute - server = utils.find_resource( - compute_client.servers, parsed_args.server) + server = compute_client.find_server( + parsed_args.server, ignore_missing=False) if self.app.client_manager.is_network_endpoint_enabled(): network_client = self.app.client_manager.network @@ -3721,7 +3721,11 @@ class RemovePort(command.Command): else: port_id = parsed_args.port - server.interface_detach(port_id) + compute_client.delete_server_interface( + port_id, + server=server, + ignore_missing=False, + ) class RemoveNetwork(command.Command): @@ -3742,10 +3746,10 @@ class RemoveNetwork(command.Command): return parser def take_action(self, parsed_args): - compute_client = self.app.client_manager.compute + compute_client = self.app.client_manager.sdk_connection.compute - server = utils.find_resource( - compute_client.servers, parsed_args.server) + server = compute_client.find_server( + parsed_args.server, ignore_missing=False) if self.app.client_manager.is_network_endpoint_enabled(): network_client = self.app.client_manager.network @@ -3754,9 +3758,12 @@ class RemoveNetwork(command.Command): else: net_id = parsed_args.network - for inf in server.interface_list(): + for inf in compute_client.server_interfaces(server): if inf.net_id == net_id: - server.interface_detach(inf.port_id) + compute_client.delete_server_interface( + inf.port_id, + server=server, + ) class RemoveServerSecurityGroup(command.Command): |