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

Add VirtualHubBgpConnections, VirtualHubIpConfigurations, NetworkVirtualApplianceSites child resources #9357

Merged
merged 17 commits into from
May 18, 2020
Merged

Add VirtualHubBgpConnections, VirtualHubIpConfigurations, NetworkVirtualApplianceSites child resources #9357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
920c589
Adds base for updating Microsoft.Network from version stable/2020-03-…
dexiang-ms Apr 29, 2020
c75bb83
Updates readme
dexiang-ms Apr 29, 2020
15c7e54
Updates API version in new specs and examples
dexiang-ms Apr 29, 2020
05a06c3
Final changes
naveenchekuri May 6, 2020
d921bdb
Fix formatting issues
naveenchekuri May 6, 2020
143436c
Merge remote-tracking branch 'Azure/network-may-release' into network…
naveenchekuri May 6, 2020
4712540
Fix merge and formatting issues
naveenchekuri May 6, 2020
721c574
Fix formatiing
naveenchekuri May 6, 2020
7993ee7
Ipconfig properties
naveenchekuri May 6, 2020
d23fcad
Fix build errors
naveenchekuri May 6, 2020
7658f1f
Lint check
naveenchekuri May 6, 2020
23f0d70
Fix semantics errors
naveenchekuri May 7, 2020
b48a379
Address review comments
naveenchekuri May 9, 2020
8a32909
Fix prettier and nextLink checks
naveenchekuri May 9, 2020
39ce69b
Fix dots
naveenchekuri May 9, 2020
0a56b42
Address errors
naveenchekuri May 10, 2020
41db203
Fix Ipconfig version
naveenchekuri May 11, 2020
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
9 changes: 7 additions & 2 deletions ...urce-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,16 @@
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1"
},
"virtualApplianceSites": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networtkVirtualAppliances/nva/virtualApplianceSites/site1"
}
],
"provisioningState": "Succeeded",
"bootStrapConfigurationBlob": [
"bootStrapConfigurationBlobs": [
"https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrbootstrapconfig"
],
"cloudInitConfigurationBlob": [
"cloudInitConfigurationBlobs": [
"https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrcloudinitconfig"
],
"virtualApplianceAsn": 10000,
Expand Down
9 changes: 7 additions & 2 deletions ...rosoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceListByResourceGroup.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,16 @@
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1"
},
"virtualApplianceSites": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networtkVirtualAppliances/nva/virtualApplianceSites/site1"
}
],
"provisioningState": "Succeeded",
"bootStrapConfigurationBlob": [
"bootStrapConfigurationBlobs": [
"https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrbootstrapconfig"
],
"cloudInitConfigurationBlob": [
"cloudInitConfigurationBlobs": [
"https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrcloudinitconfig"
],
"virtualApplianceAsn": 10000,
Expand Down
9 changes: 7 additions & 2 deletions ...crosoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceListBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,16 @@
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1"
},
"virtualApplianceSites": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networtkVirtualAppliances/nva/virtualApplianceSites/site1"
}
],
"provisioningState": "Succeeded",
"bootStrapConfigurationBlob": [
"bootStrapConfigurationBlobs": [
"https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrbootstrapconfig"
],
"cloudInitConfigurationBlob": [
"cloudInitConfigurationBlobs": [
"https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrcloudinitconfig"
],
"virtualApplianceAsn": 10000,
Expand Down
22 changes: 16 additions & 6 deletions ...urce-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualAppliancePut.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1"
},
"bootStrapConfigurationBlob": [
"bootStrapConfigurationBlobs": [
"https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrbootstrapconfig"
],
"cloudInitConfigurationBlob": [
"cloudInitConfigurationBlobs": [
"https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrcloudinitconfig"
],
"virtualApplianceAsn": 10000
Expand Down Expand Up @@ -60,11 +60,16 @@
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1"
},
"virtualApplianceSites": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networtkVirtualAppliances/nva/virtualApplianceSites/site1"
}
],
"provisioningState": "Succeeded",
"bootStrapConfigurationBlob": [
"bootStrapConfigurationBlobs": [
"https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrbootstrapconfig"
],
"cloudInitConfigurationBlob": [
"cloudInitConfigurationBlobs": [
"https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrcloudinitconfig"
],
"virtualApplianceAsn": 10000,
Expand Down Expand Up @@ -107,11 +112,16 @@
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1"
},
"virtualApplianceSites": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networtkVirtualAppliances/nva/virtualApplianceSites/site1"
}
],
"provisioningState": "Succeeded",
"bootStrapConfigurationBlob": [
"bootStrapConfigurationBlobs": [
"https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrbootstrapconfig"
],
"cloudInitConfigurationBlob": [
"cloudInitConfigurationBlobs": [
"https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrcloudinitconfig"
],
"virtualApplianceAsn": 10000,
Expand Down
14 changes: 14 additions & 0 deletions ...nager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceSiteDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"parameters": {
"api-version": "2020-05-01",
"siteName": "site1",
"subscriptionId": "subid",
"resourceGroupName": "rg1",
"networkVirtualApplianceName": "nva"
},
"responses": {
"200": {},
"202": {},
"204": {}
}
}
29 changes: 29 additions & 0 deletions ...-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceSiteGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"parameters": {
"api-version": "2020-05-01",
"siteName": "site1",
"subscriptionId": "subid",
"resourceGroupName": "rg1",
"networkVirtualApplianceName": "nva"
},
"responses": {
"200": {
"body": {
"name": "site1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkVirtualAppliances/nva/virtualApplianceSites/site1",
"etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"",
"properties": {
"provisioningState": "Succeeded",
"addressPrefix": "192.168.1.0/24",
"o365Policy": {
"breakOutCategories": {
"allow": true,
"optimize": true,
"default": true
}
}
}
}
}
}
}
33 changes: 33 additions & 0 deletions ...manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceSiteList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{
"parameters": {
"api-version": "2020-05-01",
"siteName": "site1",
"subscriptionId": "subid",
"resourceGroupName": "rg1",
"networkVirtualApplianceName": "nva"
},
"responses": {
"200": {
"body": {
"value": [
{
"name": "site1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkVirtualAppliances/nva/virtualApplianceSites/site1",
"etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"",
"properties": {
"provisioningState": "Succeeded",
"addressPrefix": "192.168.1.0/24",
"o365Policy": {
"breakOutCategories": {
"allow": true,
"optimize": true,
"default": true
}
}
}
}
]
}
}
}
}
59 changes: 59 additions & 0 deletions ...-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceSitePut.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
{
"parameters": {
"api-version": "2020-05-01",
"siteName": "site1",
"subscriptionId": "subid",
"resourceGroupName": "rg1",
"networkVirtualApplianceName": "nva",
"parameters": {
"properties": {
"addressPrefix": "192.168.1.0/24",
"o365Policy": {
"breakOutCategories": {
"allow": true,
"optimize": true,
"default": true
}
}
}
}
},
"responses": {
"200": {
"body": {
"name": "site1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkVirtualAppliances/nva/virtualApplianceSites/site1",
"etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"",
"properties": {
"provisioningState": "Succeeded",
"addressPrefix": "192.168.1.0/24",
"o365Policy": {
"breakOutCategories": {
"allow": true,
"optimize": true,
"default": true
}
}
}
}
},
"201": {
"body": {
"name": "site1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkVirtualAppliances/nva/virtualApplianceSites/site1",
"etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"",
"properties": {
"provisioningState": "Succeeded",
"addressPrefix": "192.168.1.0/24",
"o365Policy": {
"breakOutCategories": {
"allow": true,
"optimize": true,
"default": true
}
}
}
}
}
}
}
34 changes: 34 additions & 0 deletions ...e-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceSkuGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"parameters": {
"api-version": "2020-05-01",
"subscriptionId": "subid",
"resourceGroupName": "rg1",
"skuName": "ciscoSdwan"
},
"responses": {
"200": {
"body": {
"name": "ciscoSdwan",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkVirtualApplianceSkus/ciscoSdwan",
"type": "Microsoft.Network/networkVirtualApplianceSkus",
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"properties": {
"vendor": "Cisco",
"availableVersions": [
"11.12"
],
"availableScaleUnits": [
{
"scaleUnit": "1",
"instanceCount": 2
},
{
"scaleUnit": "2",
"instanceCount": 2
}
]
}
}
}
}
}
36 changes: 36 additions & 0 deletions ...-manager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceSkuList.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"parameters": {
"api-version": "2020-05-01",
"subscriptionId": "subid"
},
"responses": {
"200": {
"body": {
"value": [
{
"name": "ciscoSdwan",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkVirtualApplianceSkus/ciscoSdwan",
"type": "Microsoft.Network/networkVirtualApplianceSkus",
"etag": "w/\\00000000-0000-0000-0000-000000000000\\",
"properties": {
"vendor": "Cisco",
"availableVersions": [
"11.12"
],
"availableScaleUnits": [
{
"scaleUnit": "1",
"instanceCount": 2
},
{
"scaleUnit": "2",
"instanceCount": 2
}
]
}
}
]
}
}
}
}
9 changes: 7 additions & 2 deletions ...nager/Microsoft.Network/stable/2020-05-01/examples/NetworkVirtualApplianceUpdateTags.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,16 @@
"virtualHub": {
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1"
},
"virtualApplianceSites": [
{
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networtkVirtualAppliances/nva/virtualApplianceSites/site1"
}
],
"provisioningState": "Succeeded",
"bootStrapConfigurationBlob": [
"bootStrapConfigurationBlobs": [
"https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrbootstrapconfig"
],
"cloudInitConfigurationBlob": [
"cloudInitConfigurationBlobs": [
"https://csrncvhdstorage1.blob.core.windows.net/csrncvhdstoragecont/csrcloudinitconfig"
],
"virtualApplianceAsn": 10000,
Expand Down
14 changes: 14 additions & 0 deletions ...e-manager/Microsoft.Network/stable/2020-05-01/examples/VirtualHubBgpConnectionDelete.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"parameters": {
"api-version": "2020-05-01",
"connectionName": "conn1",
"subscriptionId": "subid",
"resourceGroupName": "rg1",
"virtualHubName": "hub1"
},
"responses": {
"200": {},
"202": {},
"204": {}
}
}
24 changes: 24 additions & 0 deletions ...urce-manager/Microsoft.Network/stable/2020-05-01/examples/VirtualHubBgpConnectionGet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{
"parameters": {
"api-version": "2020-05-01",
"connectionName": "conn1",
"subscriptionId": "subid",
"resourceGroupName": "rg1",
"virtualHubName": "hub1"
},
"responses": {
"200": {
"body": {
"name": "conn1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/hub1/bgpConnections/conn1",
"etag": "W/\"72090554-7e3b-43f2-80ad-99a9020dcb11\"",
"properties": {
"provisioningState": "Succeeded",
"peerIp": "192.168.1.5",
"peerAsn": 20000,
"connectionState": "Connected"
}
}
}
}
}
Loading