Skip to content

Commit c9ec2cf

Browse files
committed
Merge branch 'detach-azure-stack' of https://github.com/yanzhudd/azure-cli into detach-azure-stack
2 parents 6dde94a + aa910c3 commit c9ec2cf

File tree

25 files changed

+34
-26
lines changed

25 files changed

+34
-26
lines changed

src/azure-cli/azure/cli/command_modules/vm/aaz/latest/capacity/reservation/group/_list.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class List(AAZCommand):
2020
:example: List capacity reservation groups
2121
az capacity reservation group list -g rg
2222
23-
:example: List the capacity reservation groups containing VM instances and VMSS instance which are associated to capacity reservation group
23+
:example: List the capacity reservation groups containing VM instances and VMSS instance which are associated to capacity reservation group
2424
az capacity reservation group list -g rg --vm-instance --vmss-instance
2525
"""
2626

@@ -200,6 +200,7 @@ def _build_schema_on_200(cls):
200200
)
201201
properties.instance_view = AAZObjectType(
202202
serialized_name="instanceView",
203+
flags={"read_only": True},
203204
)
204205
properties.sharing_profile = AAZObjectType(
205206
serialized_name="sharingProfile",
@@ -404,6 +405,7 @@ def _build_schema_on_200(cls):
404405
)
405406
properties.instance_view = AAZObjectType(
406407
serialized_name="instanceView",
408+
flags={"read_only": True},
407409
)
408410
properties.sharing_profile = AAZObjectType(
409411
serialized_name="sharingProfile",

src/azure-cli/azure/cli/command_modules/vm/aaz/latest/disk/__cmd_group.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class __CMDGroup(AAZCommandGroup):
1818
"""Manage Azure Managed Disks.
1919
2020
Azure Virtual Machines use disks as a place to store an operating system, applications, and data. All Azure virtual machines have at least two disks: An operating system disk, and a temporary disk. The operating system disk is created from an image, and both the operating system disk and the image are actually virtual hard disks (VHDs) stored in an Azure storage account. Virtual machines also can have one or more data disks, that are also stored as VHDs.
21-
Azure Unmanaged Data Disks have a maximum size of 4095 GB. To use disks larger than 4095 GB use [Azure Managed Disks](https://docs.microsoft.com/azure/virtual-machines/managed-disks-overview)
21+
Azure Unmanaged Data Disks have a maximum size of 4095 GB. To use disks larger than 4095 GB use [Azure Managed Disks](https://learn.microsoft.com/azure/virtual-machines/managed-disks-overview)
2222
"""
2323
pass
2424

src/azure-cli/azure/cli/command_modules/vm/aaz/latest/network/nsg/__cmd_group.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
class __CMDGroup(AAZCommandGroup):
1515
"""Manage Azure Network Security Groups (NSGs).
1616
17-
You can control network traffic to resources in a virtual network using a network security group. A network security group contains a list of security rules that allow or deny inbound or outbound network traffic based on source or destination IP addresses, Application Security Groups, ports, and protocols. For more information visit https://docs.microsoft.com/azure/virtual-network/virtual-networks-create-nsg-arm-cli.
17+
You can control network traffic to resources in a virtual network using a network security group. A network security group contains a list of security rules that allow or deny inbound or outbound network traffic based on source or destination IP addresses, Application Security Groups, ports, and protocols. For more information visit https://learn.microsoft.com/azure/virtual-network/virtual-networks-create-nsg-arm-cli.
1818
"""
1919
pass
2020

src/azure-cli/azure/cli/command_modules/vm/aaz/latest/network/public_ip/__cmd_group.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
class __CMDGroup(AAZCommandGroup):
1515
"""Manage public IP addresses.
1616
17-
To learn more about public IP addresses visit https://docs.microsoft.com/azure/virtual-network/virtual-network-public-ip-address.
17+
To learn more about public IP addresses visit https://learn.microsoft.com/azure/virtual-network/virtual-network-public-ip-address.
1818
"""
1919
pass
2020

src/azure-cli/azure/cli/command_modules/vm/aaz/latest/network/vnet/__cmd_group.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
class __CMDGroup(AAZCommandGroup):
1515
"""Check if a private IP address is available for use within a virtual network.
1616
17-
To learn more about Virtual Networks visit https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-network.
17+
To learn more about Virtual Networks visit https://learn.microsoft.com/azure/virtual-network/virtual-network-manage-network.
1818
"""
1919
pass
2020

src/azure-cli/azure/cli/command_modules/vm/aaz/latest/network/vnet/subnet/__cmd_group.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
class __CMDGroup(AAZCommandGroup):
1515
"""Manage subnets in an Azure Virtual Network.
1616
17-
To learn more about subnets visit https://docs.microsoft.com/azure/virtual-network/virtual-network-manage-subnet.
17+
To learn more about subnets visit https://learn.microsoft.com/azure/virtual-network/virtual-network-manage-subnet.
1818
"""
1919
pass
2020

src/azure-cli/azure/cli/command_modules/vm/aaz/latest/vm/disk/__cmd_group.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ class __CMDGroup(AAZCommandGroup):
2323
Azure Managed and Unmanaged Data Disks have a maximum size of 4095 GB (with the exception of
2424
larger disks in preview). Azure Unmanaged Disks also have a maximum capacity of 4095 GB.
2525
For more information, see:
26-
- Azure Disks - https://docs.microsoft.com/azure/virtual-machines/managed-disks-overview.
26+
- Azure Disks - https://learn.microsoft.com/azure/virtual-machines/managed-disks-overview.
2727
- Larger Managed Disks in Public Preview - https://azure.microsoft.com/blog/introducing-the-
2828
public-preview-of-larger-managed-disks-sizes/
29-
- Ultra SSD Managed Disks in Public Preview - https://docs.microsoft.com/azure/virtual-
29+
- Ultra SSD Managed Disks in Public Preview - https://learn.microsoft.com/azure/virtual-
3030
machines/disks-types.
3131
"""
3232
pass

src/azure-cli/azure/cli/command_modules/vm/aaz/profile_2018_03_01_hybrid/capacity/reservation/group/_list.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class List(AAZCommand):
2020
:example: List capacity reservation groups
2121
az capacity reservation group list -g rg
2222
23-
:example: List the capacity reservation groups containing VM instances and VMSS instance which are associated to capacity reservation group
23+
:example: List the capacity reservation groups containing VM instances and VMSS instance which are associated to capacity reservation group
2424
az capacity reservation group list -g rg --vm-instance --vmss-instance
2525
"""
2626

@@ -200,6 +200,7 @@ def _build_schema_on_200(cls):
200200
)
201201
properties.instance_view = AAZObjectType(
202202
serialized_name="instanceView",
203+
flags={"read_only": True},
203204
)
204205
properties.sharing_profile = AAZObjectType(
205206
serialized_name="sharingProfile",
@@ -404,6 +405,7 @@ def _build_schema_on_200(cls):
404405
)
405406
properties.instance_view = AAZObjectType(
406407
serialized_name="instanceView",
408+
flags={"read_only": True},
407409
)
408410
properties.sharing_profile = AAZObjectType(
409411
serialized_name="sharingProfile",

src/azure-cli/azure/cli/command_modules/vm/aaz/profile_2018_03_01_hybrid/disk/__cmd_group.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class __CMDGroup(AAZCommandGroup):
1818
"""Manage Azure Managed Disks.
1919
2020
Azure Virtual Machines use disks as a place to store an operating system, applications, and data. All Azure virtual machines have at least two disks: An operating system disk, and a temporary disk. The operating system disk is created from an image, and both the operating system disk and the image are actually virtual hard disks (VHDs) stored in an Azure storage account. Virtual machines also can have one or more data disks, that are also stored as VHDs.
21-
Azure Unmanaged Data Disks have a maximum size of 4095 GB. To use disks larger than 4095 GB use [Azure Managed Disks](https://docs.microsoft.com/azure/virtual-machines/managed-disks-overview)
21+
Azure Unmanaged Data Disks have a maximum size of 4095 GB. To use disks larger than 4095 GB use [Azure Managed Disks](https://learn.microsoft.com/azure/virtual-machines/managed-disks-overview)
2222
"""
2323
pass
2424

src/azure-cli/azure/cli/command_modules/vm/aaz/profile_2018_03_01_hybrid/network/nsg/__cmd_group.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
class __CMDGroup(AAZCommandGroup):
1515
"""Manage Azure Network Security Groups (NSGs).
1616
17-
You can control network traffic to resources in a virtual network using a network security group. A network security group contains a list of security rules that allow or deny inbound or outbound network traffic based on source or destination IP addresses, Application Security Groups, ports, and protocols. For more information visit https://docs.microsoft.com/azure/virtual-network/virtual-networks-create-nsg-arm-cli.
17+
You can control network traffic to resources in a virtual network using a network security group. A network security group contains a list of security rules that allow or deny inbound or outbound network traffic based on source or destination IP addresses, Application Security Groups, ports, and protocols. For more information visit https://learn.microsoft.com/azure/virtual-network/virtual-networks-create-nsg-arm-cli.
1818
"""
1919
pass
2020

0 commit comments

Comments
 (0)