Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Updated the resource settings models of following tracked NRP resources #10468

Merged
merged 1 commit into from
Aug 18, 2020
Merged

Updated the resource settings models of following tracked NRP resources #10468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
318 changes: 298 additions & 20 deletions ...e/resource-manager/Microsoft.Migrate/preview/2019-10-01-preview/regionmovecollection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"tags": [
"MoveCollections"
],
"operationId": "MoveCollection_Update",
"operationId": "MoveCollections_Update",
"consumes": [
"application/json"
],
Expand Down Expand Up @@ -1722,6 +1722,20 @@
},
"x-ms-discriminator-value": "Microsoft.Compute/availabilitySets"
},
"SubnetResourceSettings": {
"description": "Defines the virtual network subnets resource settings.",
"type": "object",
"properties": {
"name": {
"description": "Gets or sets the Subnet name.",
"type": "string"
},
"addressPrefix": {
"description": "Gets or sets address prefix for the subnet.",
"type": "string"
}
}
},
"VirtualNetworkResourceSettings": {
"description": "Defines the virtual network resource settings.",
"type": "object",
Expand All @@ -1730,19 +1744,63 @@
"$ref": "#/definitions/ResourceSettings"
}
],
"properties": {},
"properties": {
"enableDdosProtection": {
"description": "Gets or sets a value indicating whether gets or sets whether the\r\nDDOS protection should be switched on.",
"type": "boolean",
"x-nullable": true
},
"addressSpace": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For semantic considerations, maybe this makes more sense if it is plural? For instance addressSpaces

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have aligned here with the network model as per the Microsoft.Network RP.

Refer: https://docs.microsoft.com/en-us/rest/api/virtualnetwork/virtualnetworks/get#addressspace

"description": "Gets or sets the address prefixes for the virtual network.",
"type": "array",
"items": {
"type": "string"
}
},
"dnsServers": {
"description": "Gets or sets DHCPOptions that contains an array of DNS servers available to VMs\r\ndeployed in the virtual network.",
"type": "array",
"items": {
"type": "string"
}
},
"subnets": {
"description": "Gets or sets List of subnets in a VirtualNetwork.",
"type": "array",
"items": {
"$ref": "#/definitions/SubnetResourceSettings"
}
}
},
"x-ms-discriminator-value": "Microsoft.Network/virtualNetworks"
},
"NetworkSecurityGroupResourceSettings": {
"description": "Defines the network security group resource settings.",
"AzureResourceReference": {
"description": "Defines reference to an Azure resource.",
"required": [
"sourceArmResourceId"
],
"type": "object",
"properties": {
"sourceArmResourceId": {
"description": "Gets the ARM resource ID of the tracked resource being referenced.",
"type": "string"
}
}
},
"ProxyResourceReference": {
"description": "Defines reference to a proxy resource.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ResourceSettings"
"$ref": "#/definitions/AzureResourceReference"
}
],
"properties": {},
"x-ms-discriminator-value": "Microsoft.Network/networkSecurityGroups"
"properties": {
"name": {
"description": "Gets the name of the proxy resource on the target side.",
"type": "string"
}
}
},
"NetworkInterfaceResourceSettings": {
"description": "Defines the network interface resource settings.",
Expand All @@ -1752,9 +1810,219 @@
"$ref": "#/definitions/ResourceSettings"
}
],
"properties": {},
"properties": {
"ipConfigurations": {
"description": "Gets or sets the IP configurations of the NIC.",
"type": "array",
"items": {
"$ref": "#/definitions/NicIpConfigurationResourceSettings"
}
},
"enableAcceleratedNetworking": {
"description": "Gets or sets a value indicating whether accelerated networking is enabled.",
"type": "boolean",
"x-nullable": true
}
},
"x-ms-discriminator-value": "Microsoft.Network/networkInterfaces"
},
"SubnetReference": {
"description": "Defines reference to subnet.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyResourceReference"
}
],
"properties": {}
},
"LoadBalancerBackendAddressPoolReference": {
"description": "Defines reference to load balancer backend address pools.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyResourceReference"
}
],
"properties": {}
},
"LoadBalancerNatRuleReference": {
"description": "Defines reference to load balancer NAT rules.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ProxyResourceReference"
}
],
"properties": {}
},
"NicIpConfigurationResourceSettings": {
"description": "Defines NIC IP configuration properties.",
"type": "object",
"properties": {
"name": {
"description": "Gets or sets the IP configuration name.",
"type": "string"
},
"privateIpAddress": {
"description": "Gets or sets the private IP address of the network interface IP Configuration.",
"type": "string"
},
"privateIpAllocationMethod": {
"description": "Gets or sets the private IP address allocation method.",
"type": "string"
},
"subnet": {
"$ref": "#/definitions/SubnetReference"
},
"primary": {
"description": "Gets or sets a value indicating whether this IP configuration is the primary.",
"type": "boolean"
},
"loadBalancerBackendAddressPools": {
"description": "Gets or sets the references of the load balancer backend address pools.",
"type": "array",
"items": {
"$ref": "#/definitions/LoadBalancerBackendAddressPoolReference"
}
}
}
},
"NsgSecurityRule": {
"description": "Security Rule data model for Network Security Groups.",
"type": "object",
"properties": {
"name": {
"description": "Gets or sets the Security rule name.",
"type": "string"
},
"access": {
"description": "Gets or sets whether network traffic is allowed or denied.\r\nPossible values are “Allow” and “Deny”.",
"type": "string"
},
"description": {
"description": "Gets or sets a description for this rule. Restricted to 140 chars.",
"type": "string"
},
"destinationAddressPrefix": {
"description": "Gets or sets destination address prefix. CIDR or source IP range.\r\n A “*” can also be used to match all source IPs. Default tags such\r\nas ‘VirtualNetwork’, ‘AzureLoadBalancer’ and ‘Internet’ can also be used.",
"type": "string"
},
"destinationPortRange": {
"description": "Gets or sets Destination Port or Range. Integer or range between\r\n0 and 65535. A “*” can also be used to match all ports.",
"type": "string"
},
"direction": {
"description": "Gets or sets the direction of the rule.InBound or Outbound. The\r\ndirection specifies if rule will be evaluated on incoming or outgoing traffic.",
"type": "string"
},
"priority": {
"format": "int32",
"description": "Gets or sets the priority of the rule. The value can be between\r\n100 and 4096. The priority number must be unique for each rule in the collection.\r\nThe lower the priority number, the higher the priority of the rule.",
"type": "integer"
},
"protocol": {
"description": "Gets or sets Network protocol this rule applies to. Can be Tcp, Udp or All(*).",
"type": "string"
},
"sourceAddressPrefix": {
"description": "Gets or sets source address prefix. CIDR or source IP range. A\r\n“*” can also be used to match all source IPs. Default tags such as ‘VirtualNetwork’,\r\n‘AzureLoadBalancer’ and ‘Internet’ can also be used. If this is an ingress\r\nrule, specifies where network traffic originates from.",
"type": "string"
},
"sourcePortRange": {
"description": "Gets or sets Source Port or Range. Integer or range between 0 and\r\n65535. A “*” can also be used to match all ports.",
"type": "string"
}
}
},
"NetworkSecurityGroupResourceSettings": {
"description": "Defines the NSG resource settings.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ResourceSettings"
}
],
"properties": {
"securityRules": {
"description": "Gets or sets Security rules of network security group.",
"type": "array",
"items": {
"$ref": "#/definitions/NsgSecurityRule"
}
}
},
"x-ms-discriminator-value": "Microsoft.Network/networkSecurityGroups"
},
"LBFrontendIPConfigurationResourceSettings": {
"description": "Defines load balancer frontend IP configuration properties.",
"type": "object",
"properties": {
"name": {
"description": "Gets or sets the frontend IP configuration name.",
"type": "string"
},
"privateIpAddress": {
"description": "Gets or sets the IP address of the Load Balancer.This is only specified if a specific\r\nprivate IP address shall be allocated from the subnet specified in subnetRef.",
"type": "string"
},
"privateIpAllocationMethod": {
"description": "Gets or sets PrivateIP allocation method (Static/Dynamic).",
"type": "string"
},
"subnet": {
"$ref": "#/definitions/SubnetReference"
},
"zones": {
"description": "Gets or sets the csv list of zones.",
"type": "string"
}
}
},
"LBBackendAddressPoolResourceSettings": {
"description": "Defines load balancer backend address pool properties.",
"type": "object",
"properties": {
"name": {
"description": "Gets or sets the backend address pool name.",
"type": "string"
}
}
},
"LoadBalancerResourceSettings": {
"description": "Defines the load balancer resource settings.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ResourceSettings"
}
],
"properties": {
"sku": {
"description": "Gets or sets load balancer sku (Basic/Standard).",
"type": "string"
},
"frontendIPConfigurations": {
"description": "Gets or sets the frontend IP configurations of the load balancer.",
"type": "array",
"items": {
"$ref": "#/definitions/LBFrontendIPConfigurationResourceSettings"
}
},
"backendAddressPools": {
"description": "Gets or sets the backend address pools of the load balancer.",
"type": "array",
"items": {
"$ref": "#/definitions/LBBackendAddressPoolResourceSettings"
}
},
"zones": {
"description": "Gets or sets the csv list of zones common for all frontend IP configurations. Note this is given\r\n precedence only if frontend IP configurations settings are not present.",
"type": "string"
}
},
"x-ms-discriminator-value": "Microsoft.Network/loadBalancers"
},
"SqlServerResourceSettings": {
"description": "Defines the SQL Server resource settings.",
"type": "object",
Expand Down Expand Up @@ -1827,19 +2095,29 @@
"$ref": "#/definitions/ResourceSettings"
}
],
"properties": {},
"x-ms-discriminator-value": "Microsoft.Network/publicIPAddresses"
},
"LoadBalancerResourceSettings": {
"description": "Defines the load balancer resource settings.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/ResourceSettings"
"properties": {
"domainNameLabel": {
"description": "Gets or sets the domain name label.",
"type": "string"
},
"fQDN": {
"description": "Gets or sets the fully qualified domain name.",
"type": "string"
},
"publicIpAllocationMethod": {
"description": "Gets or sets public IP allocation method.",
"type": "string"
},
"sku": {
"description": "Gets or sets public IP sku.",
"type": "string"
},
"zones": {
"description": "Gets or sets public IP zones.",
"type": "string"
}
],
"properties": {},
"x-ms-discriminator-value": "Microsoft.Network/loadBalancers"
},
"x-ms-discriminator-value": "Microsoft.Network/publicIPAddresses"
},
"CloudError": {
"x-ms-external": true,
Expand Down
1 change: 0 additions & 1 deletion specification/regionmove/resource-manager/readme.azureresourceschema.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,3 @@ Please also specify `--azureresourceschema-folder=<path to the root directory of
``` yaml $(tag) == 'package-2019-10-01-preview' && $(azureresourceschema)
output-folder: $(azureresourceschema-folder)/schemas
```

4 changes: 2 additions & 2 deletions specification/regionmove/resource-manager/readme.go.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ These settings apply only when `--go` is specified on the command line.
```yaml $(go)
go:
license-header: MICROSOFT_APACHE_NO_VERSION
namespace: regionmove
clear-output-folder: true
```

Expand All @@ -14,6 +15,5 @@ These settings apply only when `--tag=package-2019-10-01-preview --go` is specif
Please also specify `--go-sdks-folder=<path to the root directory of your azure-sdk-for-go clone>`.

```yaml $(tag) == 'package-2019-10-01-preview' && $(go)
namespace: Microsoft.Migrate
output-folder: $(go-sdks-folder)/regionmove/Generated
output-folder: $(go-sdk-folder)/services/preview/$(namespace)/mgmt/2019-10-01-preview/$(namespace)
```