Skip to content

Commit 5058e03

Browse files
authored
[Service Fabric] az sf managed-cluster network-security-rule add: Add new parameters for port ranges and address prefixes (#31714)
1 parent e39ecb4 commit 5058e03

5 files changed

Lines changed: 3914 additions & 1455 deletions

File tree

src/azure-cli/azure/cli/command_modules/servicefabric/_help.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -473,10 +473,15 @@
473473
type: command
474474
short-summary: Add a network security rule to a managed cluster.
475475
examples:
476-
- name: Add network security rule.
476+
- name: Add network security rule with multiple source and destination address prefixes.
477477
text: >
478478
az sf managed-cluster network-security-rule add -g testRG -c testCluster --name 'network security rule name' --access allow --description 'network security rule description' --direction inbound --protocol tcp --priority 1200 \
479479
--source-port-ranges 1-1000 --dest-port-ranges 1-65535 --source-addr-prefixes 167.220.242.0/27 167.220.0.0/23 131.107.132.16/28 167.220.81.128/26 --dest-addr-prefixes 194.69.104.0/25 194.69.119.64/26 167.220.249.128/26 255.255.255.255/32
480+
481+
- name: Add network security rule with single source and destination address prefix.
482+
text: >
483+
az sf managed-cluster network-security-rule add -g testRG -c testCluster --name 'network security rule name' --access deny --description 'network security rule description' --direction inbound --protocol any --priority 1300 \
484+
--source-port-range * --dest-port-ranges 19000 19080 --source-addr-prefix Internet --dest-addr-prefix *
480485
"""
481486

482487
helps['sf managed-cluster network-security-rule update'] = """

src/azure-cli/azure/cli/command_modules/servicefabric/_params.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,8 +288,12 @@ def load_arguments(self, _): # pylint: disable=too-many-statements
288288
c.argument('protocol', arg_type=get_enum_type(['tcp', 'https', 'http', 'udp', 'icmp', 'ah', 'esp', 'any']), help='Network protocol')
289289
c.argument('source_port_ranges', nargs='+', help='A single or space separated list of source port ranges')
290290
c.argument('dest_port_ranges', nargs='+', help='A single or space separated list of destination port ranges')
291+
c.argument('source_port_range', help='The source port or range. Integer or range between 0 and 65535. Asterisk \'*\' can also be used to match all ports.')
292+
c.argument('dest_port_range', help='The destination port or range. Integer or range between 0 and 65535. Asterisk \'*\' can also be used to match all ports.')
291293
c.argument('source_addr_prefixes', nargs='+', help='The CIDR or source IP ranges. A single or space separated list of source address prefixes')
292294
c.argument('dest_addr_prefixes', nargs='+', help='CIDR or destination IP ranges. A single or space separated list of destination address prefixes')
295+
c.argument('source_addr_prefix', help='The CIDR or source IP range. Asterisk \'*\' can also be used to match all source IPs. Default tags such as \'VirtualNetwork\', \'AzureLoadBalancer\' and \'Internet\' can also be used. If this is an ingress rule, specifies where network traffic originates from.')
296+
c.argument('dest_addr_prefix', help='The destination address prefix. CIDR or destination IP range. Asterisk \'*\' can also be used to match all source IPs. Default tags such as \'VirtualNetwork\', \'AzureLoadBalancer\' and \'Internet\' can also be used.')
293297

294298
# managed node type
295299
capacity = CLIArgumentType(

src/azure-cli/azure/cli/command_modules/servicefabric/operations/managed_clusters.py

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,12 @@ def add_network_security_rule(cmd,
244244
priority=None,
245245
source_port_ranges=None,
246246
dest_port_ranges=None,
247+
source_port_range=None,
248+
dest_port_range=None,
247249
dest_addr_prefixes=None,
248-
source_addr_prefixes=None):
250+
source_addr_prefixes=None,
251+
dest_addr_prefix=None,
252+
source_addr_prefix=None):
249253
try:
250254
cluster = client.managed_clusters.get(resource_group_name, cluster_name)
251255

@@ -260,8 +264,12 @@ def add_network_security_rule(cmd,
260264
priority=priority,
261265
source_port_ranges=source_port_ranges,
262266
destination_port_ranges=dest_port_ranges,
267+
source_port_range=source_port_range,
268+
destination_port_range=dest_port_range,
263269
destination_address_prefixes=dest_addr_prefixes,
264-
source_address_prefixes=source_addr_prefixes)
270+
source_address_prefixes=source_addr_prefixes,
271+
destination_address_prefix=dest_addr_prefix,
272+
source_address_prefix=source_addr_prefix)
265273

266274
cluster.network_security_rules.append(new_network_securityRule)
267275

0 commit comments

Comments
 (0)