Skip to content

Commit

Permalink
Add VirtualHubBgpConnections, VirtualHubIpConfigurations, NetworkVirt…
Browse files Browse the repository at this point in the history
…ualApplianceSites child resources (Azure#9357)

* Adds base for updating Microsoft.Network from version stable/2020-03-01 to version 2020-05-01

* Updates readme

* Updates API version in new specs and examples

* Final changes

* Fix formatting issues

* Fix merge and formatting issues

* Fix formatiing

* Ipconfig properties

* Fix build errors

* Lint check

* Fix semantics errors

* Address review comments

* Fix prettier and nextLink checks

* Fix dots

* Address errors

* Fix Ipconfig version

Co-authored-by: dexiang-ms <64503627+dexiang-ms@users.noreply.github.com>
  • Loading branch information
2 people authored and MyronFanQiu committed Jun 4, 2020
1 parent 069d4bd commit 49f999c
Show file tree
Hide file tree
Showing 26 changed files with 1,783 additions and 118 deletions.
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
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
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
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
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": {}
}
}
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
}
}
}
}
}
}
}
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
}
}
}
}
]
}
}
}
}
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
}
}
}
}
}
}
}
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
}
]
}
}
}
}
}
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
}
]
}
}
]
}
}
}
}
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
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": {}
}
}
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

0 comments on commit 49f999c

Please sign in to comment.