Merge "Remove dead nova-network utils"

Author: Zuul

openstackclient/network/utils.py

@@ -9,47 +9,14 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
-from collections.abc import Iterable, Sequence
 from typing import Any, cast
 
 from osc_lib import exceptions
 
 from openstackclient.i18n import _
 
 
-# Transform compute security group rule for display.
-def transform_compute_security_group_rule(
-    sg_rule: dict[str, Any],
-) -> dict[str, Any]:
-    info = {}
-    info.update(sg_rule)
-    from_port = info.pop('from_port')
-    to_port = info.pop('to_port')
-    if isinstance(from_port, int) and isinstance(to_port, int):
-        port_range = {'port_range': f"{from_port}:{to_port}"}
-    elif from_port is None and to_port is None:
-        port_range = {'port_range': ""}
-    else:
-        port_range = {'port_range': f"{from_port}:{to_port}"}
-    info.update(port_range)
-    if 'cidr' in info['ip_range']:
-        info['ip_range'] = info['ip_range']['cidr']
-    else:
-        info['ip_range'] = ''
-    if info['ip_protocol'] is None:
-        info['ip_protocol'] = ''
-    elif info['ip_protocol'].lower() == 'icmp':
-        info['port_range'] = ''
-    group = info.pop('group')
-    if 'name' in group:
-        info['remote_security_group'] = group['name']
-    else:
-        info['remote_security_group'] = ''
-    return info
-
-
 def str2bool(strbool: str | None) -> bool | None:
     if strbool is None:
         return None
@@ -88,14 +55,6 @@ def str2dict(strdict: str) -> dict[str, str]:
     return result
 
 
-def format_security_group_rule_show(
-    obj: dict[str, Any],
-) -> tuple[Sequence[str], Iterable[Any]]:
-    data = transform_compute_security_group_rule(obj)
-    col_headers, col_data = zip(*sorted(data.items()))
-    return col_headers, col_data
-
-
 def format_network_port_range(rule: dict[str, Any]) -> str:
     # Display port range or ICMP type and code. For example:
     # - ICMP type: 'type=3'

openstackclient/network/v2/security_group.py

@@ -9,7 +9,6 @@
 #   WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 #   License for the specific language governing permissions and limitations
 #   under the License.
-#
 
 """Security Group action implementations"""
 
@@ -27,17 +26,15 @@
 from openstackclient.i18n import _
 from openstackclient.identity import common as identity_common
 from openstackclient.network import common
-from openstackclient.network import utils as network_utils
 
 LOG = logging.getLogger(__name__)
 
 
 def _format_network_security_group_rules(
     sg_rules: list[dict[str, Any]],
 ) -> str:
-    # For readability and to align with formatting compute security group
-    # rules, trim keys with caller known (e.g. security group and tenant ID)
-    # or empty values.
+    # For readability, trim keys with caller known (e.g. security group and
+    # tenant ID) or empty values.
     for sg_rule in sg_rules:
         empty_keys = [k for k, v in sg_rule.items() if not v]
         for key in empty_keys:
@@ -48,52 +45,16 @@ def _format_network_security_group_rules(
     return utils.format_list_of_dicts(sg_rules) or ""
 
 
-def _format_compute_security_group_rule(sg_rule: dict[str, Any]) -> str:
-    info = network_utils.transform_compute_security_group_rule(sg_rule)
-    # Trim parent security group ID since caller has this information.
-    info.pop('parent_group_id', None)
-    # Trim keys with empty string values.
-    keys_to_trim = [
-        'ip_protocol',
-        'ip_range',
-        'port_range',
-        'remote_security_group',
-    ]
-    for key in keys_to_trim:
-        if key in info and not info[key]:
-            info.pop(key)
-    return utils.format_dict(info)
-
-
-def _format_compute_security_group_rules(
-    sg_rules: list[dict[str, Any]],
-) -> str:
-    rules = []
-    for sg_rule in sg_rules:
-        rules.append(_format_compute_security_group_rule(sg_rule))
-    return utils.format_list(rules, separator='\n') or ""
-
-
 class NetworkSecurityGroupRulesColumn(cliff_columns.FormattableColumn[Any]):
     def human_readable(self) -> str:
         return _format_network_security_group_rules(self._value)
 
 
-class ComputeSecurityGroupRulesColumn(cliff_columns.FormattableColumn[Any]):
-    def human_readable(self) -> str:
-        return _format_compute_security_group_rules(self._value)
-
-
-_formatters_network = {
+_formatters = {
     'security_group_rules': NetworkSecurityGroupRulesColumn,
 }
 
 
-_formatters_compute = {
-    'rules': ComputeSecurityGroupRulesColumn,
-}
-
-
 def _get_columns(item: Any) -> tuple[tuple[str, ...], tuple[str, ...]]:
     # We still support Nova managed security groups, where we have tenant_id.
     column_map = {
@@ -176,7 +137,7 @@ def take_action(
         _tag.update_tags_for_set(client, obj, parsed_args)
         display_columns, property_columns = _get_columns(obj)
         data = utils.get_item_properties(
-            obj, property_columns, formatters=_formatters_network
+            obj, property_columns, formatters=_formatters
         )
         return (display_columns, data)
 
@@ -394,7 +355,7 @@ def take_action(
         )
         display_columns, property_columns = _get_columns(obj)
         data = utils.get_item_properties(
-            obj, property_columns, formatters=_formatters_network
+            obj, property_columns, formatters=_formatters
         )
         return (display_columns, data)