Skip to content

Commit ec98b0d

Browse files
authored
fixing NRP networking resource properties (#12570)
* fixing NRP networking resource properties * fixing natgateway and privatelinkservice references * adding custom word privatelinkservice * virtualnetwork prettier fix * added custom word natgateway * added more missing resource properties as per S360 * correct natgateway reference * revert 'Error' property casing * fix linkedpublicipaddress property * adding enum values * added prefixes and prettier check done * added prefix for 2 properties
1 parent 2083db7 commit ec98b0d

File tree

11 files changed

+212
-5
lines changed

11 files changed

+212
-5
lines changed

custom-words.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2094,3 +2094,5 @@ azureasyncoperations
20942094
saskey
20952095
vmsize
20962096
FSLogix
2097+
privatelinkservice
2098+
natgateway

specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/networkInterface.json

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1035,6 +1035,10 @@
10351035
"readOnly": true,
10361036
"type": "string",
10371037
"description": "A unique read-only string that changes whenever the resource is updated."
1038+
},
1039+
"type": {
1040+
"type": "string",
1041+
"description": "Resource type."
10381042
}
10391043
},
10401044
"allOf": [
@@ -1153,6 +1157,22 @@
11531157
"readOnly": true,
11541158
"$ref": "./network.json#/definitions/ProvisioningState",
11551159
"description": "The provisioning state of the network interface resource."
1160+
},
1161+
"nicType": {
1162+
"type": "string",
1163+
"description": "Type of Network Interface resource.",
1164+
"enum": [
1165+
"Standard",
1166+
"Elastic"
1167+
],
1168+
"x-ms-enum": {
1169+
"name": "NetworkInterfaceNicType",
1170+
"modelAsString": true
1171+
}
1172+
},
1173+
"privateLinkService": {
1174+
"$ref": "./privateLinkService.json#/definitions/PrivateLinkService",
1175+
"description": "Privatelinkservice of the network interface resource."
11561176
}
11571177
},
11581178
"description": "NetworkInterface properties."
@@ -1485,7 +1505,8 @@
14851505
},
14861506
"privateIPAllocationMethod": {
14871507
"$ref": "./network.json#/definitions/IPAllocationMethod",
1488-
"description": "The private IP address allocation method."
1508+
"description": "The private IP address allocation method.",
1509+
"default": "Dynamic"
14891510
},
14901511
"subnet": {
14911512
"$ref": "./virtualNetwork.json#/definitions/Subnet",

specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/privateEndpoint.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -850,6 +850,10 @@
850850
"resourceName": {
851851
"type": "string",
852852
"description": "The name of the service and resource."
853+
},
854+
"displayName": {
855+
"type": "string",
856+
"description": "Display name of the resource."
853857
}
854858
},
855859
"description": "The information of an AvailablePrivateEndpointType."

specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/publicIpAddress.json

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,29 @@
444444
"readOnly": true,
445445
"$ref": "./network.json#/definitions/ProvisioningState",
446446
"description": "The provisioning state of the public IP address resource."
447+
},
448+
"natGateway": {
449+
"$ref": "./natGateway.json#/definitions/NatGateway",
450+
"description": "The NatGateway for the Public IP address."
451+
},
452+
"migrationPhase": {
453+
"type": "string",
454+
"description": "Migration phase of Public IP Address.",
455+
"enum": [
456+
"None",
457+
"Prepare",
458+
"Commit",
459+
"Abort",
460+
"Committed"
461+
],
462+
"x-ms-enum": {
463+
"name": "PublicIPAddressMigrationPhase",
464+
"modelAsString": true
465+
}
466+
},
467+
"linkedPublicIPAddress": {
468+
"$ref": "#/definitions/PublicIPAddress",
469+
"description": "The linked public IP address of the public IP address resource."
447470
}
448471
},
449472
"description": "Public IP address properties."

specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/publicIpPrefix.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,10 @@
437437
"readOnly": true,
438438
"$ref": "./network.json#/definitions/ProvisioningState",
439439
"description": "The provisioning state of the public IP prefix resource."
440+
},
441+
"natGateway": {
442+
"$ref": "./natGateway.json#/definitions/NatGateway",
443+
"description": "NatGateway of Public IP Prefix."
440444
}
441445
},
442446
"description": "Public IP prefix properties."

specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/serviceTags.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,11 @@
163163
},
164164
"readOnly": true,
165165
"description": "The list of IP address prefixes."
166+
},
167+
"state": {
168+
"type": "string",
169+
"readOnly": true,
170+
"description": "The state of the service tag."
166171
}
167172
},
168173
"description": "Properties of the service tag information."

specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/virtualNetwork.json

Lines changed: 37 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1496,11 +1496,29 @@
14961496
},
14971497
"privateEndpointNetworkPolicies": {
14981498
"type": "string",
1499-
"description": "Enable or Disable apply network policies on private end point in the subnet."
1499+
"default": "Enabled",
1500+
"description": "Enable or Disable apply network policies on private end point in the subnet.",
1501+
"enum": [
1502+
"Enabled",
1503+
"Disabled"
1504+
],
1505+
"x-ms-enum": {
1506+
"name": "VirtualNetworkPrivateEndpointNetworkPolicies",
1507+
"modelAsString": true
1508+
}
15001509
},
15011510
"privateLinkServiceNetworkPolicies": {
15021511
"type": "string",
1503-
"description": "Enable or Disable apply network policies on private link service in the subnet."
1512+
"default": "Enabled",
1513+
"description": "Enable or Disable apply network policies on private link service in the subnet.",
1514+
"enum": [
1515+
"Enabled",
1516+
"Disabled"
1517+
],
1518+
"x-ms-enum": {
1519+
"name": "VirtualNetworkPrivateLinkServiceNetworkPolicies",
1520+
"modelAsString": true
1521+
}
15041522
}
15051523
},
15061524
"description": "Properties of the subnet."
@@ -1574,6 +1592,11 @@
15741592
"readOnly": true,
15751593
"$ref": "./network.json#/definitions/ProvisioningState",
15761594
"description": "The provisioning state of the virtual network peering resource."
1595+
},
1596+
"resourceGuid": {
1597+
"readOnly": true,
1598+
"type": "string",
1599+
"description": "The resourceGuid property of the Virtual Network peering resource."
15771600
}
15781601
},
15791602
"description": "Properties of the virtual network peering."
@@ -1593,6 +1616,10 @@
15931616
"readOnly": true,
15941617
"type": "string",
15951618
"description": "A unique read-only string that changes whenever the resource is updated."
1619+
},
1620+
"type": {
1621+
"type": "string",
1622+
"description": "Resource type."
15961623
}
15971624
},
15981625
"allOf": [
@@ -1617,6 +1644,10 @@
16171644
"readOnly": true,
16181645
"type": "string",
16191646
"description": "A unique read-only string that changes whenever the resource is updated."
1647+
},
1648+
"type": {
1649+
"type": "string",
1650+
"description": "Resource type."
16201651
}
16211652
},
16221653
"allOf": [
@@ -1849,6 +1880,10 @@
18491880
"type": "string"
18501881
},
18511882
"description": "Contains other available private IP addresses if the asked for address is taken."
1883+
},
1884+
"isPlatformReserved": {
1885+
"type": "boolean",
1886+
"description": "Private IP address platform reserved."
18521887
}
18531888
},
18541889
"description": "Response for CheckIPAddressAvailability API service call."

specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/networkInterface.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1035,6 +1035,10 @@
10351035
"readOnly": true,
10361036
"type": "string",
10371037
"description": "A unique read-only string that changes whenever the resource is updated."
1038+
},
1039+
"type": {
1040+
"type": "string",
1041+
"description": "Resource type."
10381042
}
10391043
},
10401044
"allOf": [
@@ -1153,6 +1157,38 @@
11531157
"readOnly": true,
11541158
"$ref": "./network.json#/definitions/ProvisioningState",
11551159
"description": "The provisioning state of the network interface resource."
1160+
},
1161+
"nicType": {
1162+
"type": "string",
1163+
"default": "Standard",
1164+
"description": "Type of Network Interface resource.",
1165+
"enum": [
1166+
"Standard",
1167+
"Elastic"
1168+
],
1169+
"x-ms-enum": {
1170+
"name": "NetworkInterfaceNicType",
1171+
"modelAsString": true
1172+
}
1173+
},
1174+
"privateLinkService": {
1175+
"$ref": "./privateLinkService.json#/definitions/PrivateLinkService",
1176+
"description": "Privatelinkservice of the network interface resource."
1177+
},
1178+
"migrationPhase": {
1179+
"type": "string",
1180+
"description": "Migration phase of Network Interface resource.",
1181+
"enum": [
1182+
"None",
1183+
"Prepare",
1184+
"Commit",
1185+
"Abort",
1186+
"Committed"
1187+
],
1188+
"x-ms-enum": {
1189+
"name": "NetworkInterfaceMigrationPhase",
1190+
"modelAsString": true
1191+
}
11561192
}
11571193
},
11581194
"description": "NetworkInterface properties."

specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpAddress.json

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -444,6 +444,33 @@
444444
"readOnly": true,
445445
"$ref": "./network.json#/definitions/ProvisioningState",
446446
"description": "The provisioning state of the public IP address resource."
447+
},
448+
"servicePublicIPAddress": {
449+
"$ref": "#/definitions/PublicIPAddress",
450+
"description": "The service public IP address of the public IP address resource."
451+
},
452+
"natGateway": {
453+
"$ref": "./natGateway.json#/definitions/NatGateway",
454+
"description": "The NatGateway for the Public IP address."
455+
},
456+
"migrationPhase": {
457+
"type": "string",
458+
"description": "Migration phase of Public IP Address.",
459+
"enum": [
460+
"None",
461+
"Prepare",
462+
"Commit",
463+
"Abort",
464+
"Committed"
465+
],
466+
"x-ms-enum": {
467+
"name": "PublicIpAddressMigrationPhase",
468+
"modelAsString": true
469+
}
470+
},
471+
"linkedPublicIPAddress": {
472+
"$ref": "#/definitions/PublicIPAddress",
473+
"description": "The source Public IP Address (IPv6) that links to this address (IPv4)."
447474
}
448475
},
449476
"description": "Public IP address properties."

specification/network/resource-manager/Microsoft.Network/stable/2020-08-01/publicIpPrefix.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -437,6 +437,10 @@
437437
"readOnly": true,
438438
"$ref": "./network.json#/definitions/ProvisioningState",
439439
"description": "The provisioning state of the public IP prefix resource."
440+
},
441+
"natGateway": {
442+
"$ref": "./natGateway.json#/definitions/NatGateway",
443+
"description": "NatGateway of Public IP Prefix."
440444
}
441445
},
442446
"description": "Public IP prefix properties."

0 commit comments

Comments
 (0)