Skip to content

Commit 40cca9d

Browse files
ritwikbasusergey-shandar
ritwikbasu
authored and
sergey-shandar
committed
Brooklyn Ignite Swagger changes (#3715)
* Brooklyn Ignite Swagger changes * Add missing example file changes * Add virtual hub route table * Fix travis build error * VPN profile bugfix * Fix casing for NRP automapping * Fix parsing errors * remove BgpSettings from P2SVpnGateway object * Added AddressPrefixes on Subnet properties (#3714) * Added address prefixes to subnet * Added example of multiple address prefixes. * Python Network conf 2018-08-01 * Changes to include required properties for outbound rule (#3728) * Mark outbound rule properties as required * Update outbound rule with required properties * Removing old change * Fix Python 2018-08 conf * Fix swagger contract errors with NRP * Fix network swagger * Fix virtualHub Properties for SDK and PS JSON serializer compliance * Fix bugs * Changing Cortex swagger to match NRP * Bug fixes * bugFix3 * Bug fix * Use only PublicIpAddress in Azure Firewall, not both Public and InternalPublic (#3743) * Do not confuse users with both InternalPublicIp and PublicIp for the same thing * Update AzureFirewall PUT example * This closes #3474 * Use the correct name for publicIPAddress in AzureFirewall PUT example * Azure Firewall FQDN Tag top level resource (#3744) * Azure Firewall FQDN Tag top level resource * Name FqdnTags property in AzureFirewallApplicationRule properly * Empty commit to trigger new validation * Vtapfinal (#3684) * Swagger Coverage/Completeness- for operation CheckNameAvailability (#3663) * Update service.json * CheckNameAvailability * FIxed Parameter name fixed couple of parameters name * Adds base for updating Microsoft.Network from version stable/2018-07-01 to version 2018-08-01 * Updates readme * Updates API version in new specs and examples * vtap update * VTAP changes * VTAP changes * Adding examples for VTAP resource * Update changes for Examples * Further fixes to examples * Add exception for vtap's RequiredPropertiesMissingInResourceModel in readme * Azure Firewall NAT Rule Collection (#3745) * NAT Rule Collections for Azure Firewall * Update examples to include the new NAT Rule Collection * Shorten the NAT RC Properties name and mark etag read-only * Add NAT Rule Collection to Azure Firewall properties * Fix all <<a Azure>> in helper messages * Do not allow ICMP as Network protocol (#3742) * Adding linkedResourceType and hostedWorkloads to nic (#3780) * Adding support for interface endpoints (#3783) * Creating Interface Endpoint definition * Adding references to interface endpoints in existing resources * Added Trusted root certificate changes to new API version (#3731) * Add ExpressRoute gateway resource (#3776) * Initial version * Refactor connections. * Update API version * Add enum values. * Addressed all comments. * Adding support for delegations on a subnet (#3805) * Adding subnet delegation property on VNET * Updating subnet/vnet create & get examples to reflect delegation * Adding support for GetAvailableDelegations operation * Fixing properties in Swagger & updating examples to reflect fixes * Add availableDelegation as a subResource * Remove type from examples * Further updates to delegation PR * Additional changes to structure * Correct issues for SDK generation (#3818) * Remove x-ms-client-flatten attribute as that results in wrong descriptiosn during generation of the SDKs. * Missing descriptions. * Rename TargetUrls to TargetFqdns (#3739) * Fix travis errors in examples * Fixed error examples for P2S cortex resources * Fix swagger * Fix Semantic validation error * network swagger fix * Fix travis * Fix travis errors * Revert version change * Dummy changes for CI restart
1 parent c34505c commit 40cca9d

35 files changed

+2475
-468
lines changed

‎specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/P2SVpnGatewayDelete.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"parameters": {
3+
"gatewayName": "p2sVpnGateway1",
4+
"resourceGroupName": "rg1",
5+
"api-version": "2018-08-01",
6+
"subscriptionId": "subid"
7+
},
8+
"responses": {
9+
"200": { },
10+
"202": { },
11+
"204": { }
12+
}
13+
}

‎specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/P2SVpnGatewayGenerateVpnProfile.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"parameters": {
3+
"api-version": "2018-08-01",
4+
"subscriptionId": "subid",
5+
"resourceGroupName": "rg1",
6+
"gatewayName" : "p2sVpnGateway1",
7+
"parameters": {
8+
"authenticationMethod": "EAPTLS"
9+
}
10+
},
11+
"responses" : {
12+
"202" : {
13+
},
14+
"200" : {
15+
"body" : ""
16+
}
17+
}
18+
}
19+

‎specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/P2SVpnGatewayGet.json‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
{
2+
"parameters": {
3+
"gatewayName": "p2sVpnGateway1",
4+
"resourceGroupName": "rg1",
5+
"api-version": "2018-08-01",
6+
"subscriptionId": "subid"
7+
},
8+
"responses": {
9+
"200": {
10+
"body": {
11+
"name": "p2sVpnGateway1",
12+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/P2SvpnGateways/p2sVpnGateway1",
13+
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
14+
"location": "West US",
15+
"type": "Microsoft.Network/p2sVpnGateways",
16+
"properties": {
17+
"provisioningState": "Succeeded",
18+
"virtualHub": {
19+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1"
20+
},
21+
"p2SVpnServerConfiguration": {
22+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWans/virtualWan1/p2sVpnServerConfigurations/p2sVpnServerConfiguration1"
23+
},
24+
"vpnClientAddressPool": {
25+
"addressPrefixes": [
26+
"101.3.0.0/16"
27+
]
28+
},
29+
"vpnGatewayScaleUnit": 1,
30+
"vpnClientConnectionHealth": {
31+
"vpnClientConnectionsCount": 2,
32+
"allocatedIpAddresses": [
33+
"1.1.1.1",
34+
"2.2.2.2"
35+
],
36+
"totalIngressBytesTransferred":2000,
37+
"totalEgressBytesTransferred":3000
38+
}
39+
}
40+
}
41+
}
42+
}
43+
}

‎specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/P2SVpnGatewayList.json‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
{
2+
"parameters": {
3+
"api-version": "2018-08-01",
4+
"resourceGroupName": "rg1",
5+
"subscriptionId": "subid"
6+
},
7+
"responses": {
8+
"200": {
9+
"body": {
10+
"value": [
11+
{
12+
"name": "p2sVpnGateway1",
13+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/P2SvpnGateways/p2sVpnGateway1",
14+
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
15+
"location": "West US",
16+
"type": "Microsoft.Network/p2sVpnGateways",
17+
"properties": {
18+
"provisioningState": "Succeeded",
19+
"virtualHub": {
20+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1"
21+
},
22+
"p2SVpnServerConfiguration": {
23+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWans/virtualWan1/p2sVpnServerConfigurations/p2sVpnServerConfiguration1"
24+
},
25+
"vpnClientAddressPool": {
26+
"addressPrefixes": [
27+
"101.3.0.0/16"
28+
]
29+
},
30+
"vpnGatewayScaleUnit": 1,
31+
"vpnClientConnectionHealth": {
32+
"vpnClientConnectionsCount": 2,
33+
"allocatedIpAddresses": [
34+
"1.1.1.1",
35+
"2.2.2.2"
36+
],
37+
"totalIngressBytesTransferred":2000,
38+
"totalEgressBytesTransferred":3000
39+
}
40+
}
41+
},
42+
{
43+
"name": "p2sVpnGateway2",
44+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/P2SvpnGateways/p2sVpnGateway2",
45+
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
46+
"location": "West US",
47+
"type": "Microsoft.Network/p2sVpnGateways",
48+
"properties": {
49+
"provisioningState": "Succeeded",
50+
"virtualHub": {
51+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2"
52+
},
53+
"p2SVpnServerConfiguration": {
54+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWans/virtualWan1/p2sVpnServerConfigurations/p2sVpnServerConfiguration1"
55+
},
56+
"vpnClientAddressPool": {
57+
"addressPrefixes": [
58+
"101.4.0.0/16"
59+
]
60+
},
61+
"vpnGatewayScaleUnit": 1,
62+
"vpnClientConnectionHealth": {
63+
"vpnClientConnectionsCount": 2,
64+
"allocatedIpAddresses": [
65+
"1.1.1.1",
66+
"2.2.2.2"
67+
],
68+
"totalIngressBytesTransferred":2000,
69+
"totalEgressBytesTransferred":3000
70+
}
71+
}
72+
}
73+
]
74+
}
75+
}
76+
}
77+
}

‎specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/P2SVpnGatewayListByResourceGroup.json‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
{
2+
"parameters": {
3+
"api-version": "2018-08-01",
4+
"resourceGroupName": "rg1",
5+
"subscriptionId": "subid"
6+
},
7+
"responses": {
8+
"200": {
9+
"body": {
10+
"value": [
11+
{
12+
"name": "p2sVpnGateway1",
13+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/P2SvpnGateways/p2sVpnGateway1",
14+
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
15+
"location": "West US",
16+
"type": "Microsoft.Network/p2sVpnGateways",
17+
"properties": {
18+
"provisioningState": "Succeeded",
19+
"virtualHub": {
20+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1"
21+
},
22+
"p2SVpnServerConfiguration": {
23+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWans/virtualWan1/p2sVpnServerConfigurations/p2sVpnServerConfiguration1"
24+
},
25+
"vpnClientAddressPool": {
26+
"addressPrefixes": [
27+
"101.3.0.0/16"
28+
]
29+
},
30+
"vpnGatewayScaleUnit": 1,
31+
"vpnClientConnectionHealth": {
32+
"vpnClientConnectionsCount": 2,
33+
"allocatedIpAddresses": [
34+
"1.1.1.1",
35+
"2.2.2.2"
36+
],
37+
"totalIngressBytesTransferred":2000,
38+
"totalEgressBytesTransferred":3000
39+
}
40+
}
41+
},
42+
{
43+
"name": "p2sVpnGateway2",
44+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/P2SvpnGateways/p2sVpnGateway2",
45+
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
46+
"location": "West US",
47+
"type": "Microsoft.Network/p2sVpnGateways",
48+
"properties": {
49+
"provisioningState": "Succeeded",
50+
"virtualHub": {
51+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub2"
52+
},
53+
"p2SVpnServerConfiguration": {
54+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWans/virtualWan1/p2sVpnServerConfigurations/p2sVpnServerConfiguration1"
55+
},
56+
"vpnClientAddressPool": {
57+
"addressPrefixes": [
58+
"101.4.0.0/16"
59+
]
60+
},
61+
"vpnGatewayScaleUnit": 1,
62+
"vpnClientConnectionHealth": {
63+
"vpnClientConnectionsCount": 2,
64+
"allocatedIpAddresses": [
65+
"1.1.1.1",
66+
"2.2.2.2"
67+
],
68+
"totalIngressBytesTransferred":2000,
69+
"totalEgressBytesTransferred":3000
70+
}
71+
}
72+
}
73+
]
74+
}
75+
}
76+
}
77+
}

‎specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/P2SVpnGatewayPut.json‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
{
2+
"parameters": {
3+
"gatewayName": "p2sVpnGateway1",
4+
"resourceGroupName": "rg1",
5+
"api-version": "2018-08-01",
6+
"subscriptionId": "subid",
7+
"p2SVpnGatewayParameters": {
8+
"location": "West US",
9+
"tags": {
10+
"key1": "value1"
11+
},
12+
"properties": {
13+
"virtualHub": {
14+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1"
15+
},
16+
"p2SVpnServerConfiguration": {
17+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWans/virtualWan1/p2sVpnServerConfigurations/p2sVpnServerConfiguration1"
18+
},
19+
"vpnClientAddressPool": {
20+
"addressPrefixes": [
21+
"101.3.0.0/16"
22+
]
23+
},
24+
"vpnGatewayScaleUnit": 1
25+
}
26+
}
27+
},
28+
"responses": {
29+
"200": {
30+
"name": "p2sVpnGateway1",
31+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/P2SvpnGateways/p2sVpnGateway1",
32+
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
33+
"location": "West US",
34+
"type": "Microsoft.Network/p2sVpnGateways",
35+
"properties": {
36+
"provisioningState": "Succeeded",
37+
"virtualHub": {
38+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1"
39+
},
40+
"p2SVpnServerConfiguration": {
41+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWans/virtualWan1/p2sVpnServerConfigurations/p2sVpnServerConfiguration1"
42+
},
43+
"vpnClientAddressPool": {
44+
"addressPrefixes": [
45+
"101.3.0.0/16"
46+
]
47+
},
48+
"vpnGatewayScaleUnit": 1,
49+
"vpnClientConnectionHealth": {
50+
"vpnClientConnectionsCount": 0,
51+
"allocatedIpAddresses": [],
52+
"totalIngressBytesTransferred": 0,
53+
"totalEgressBytesTransferred": 0
54+
}
55+
}
56+
},
57+
"201": {
58+
"name": "p2sVpnGateway1",
59+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/P2SvpnGateways/p2sVpnGateway1",
60+
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
61+
"location": "West US",
62+
"type": "Microsoft.Network/p2sVpnGateways",
63+
"properties": {
64+
"provisioningState": "Succeeded",
65+
"virtualHub": {
66+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1"
67+
},
68+
"p2SVpnServerConfiguration": {
69+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWans/virtualWan1/p2sVpnServerConfigurations/p2sVpnServerConfiguration1"
70+
},
71+
"vpnClientAddressPool": {
72+
"addressPrefixes": [
73+
"101.3.0.0/16"
74+
]
75+
},
76+
"vpnGatewayScaleUnit": 1,
77+
"vpnClientConnectionHealth": {
78+
"vpnClientConnectionsCount": 0,
79+
"allocatedIpAddresses": [],
80+
"totalIngressBytesTransferred": 0,
81+
"totalEgressBytesTransferred": 0
82+
}
83+
}
84+
}
85+
}
86+
}

0 commit comments

Comments
 (0)