Merge branch 'network-july-release' of https://github.com/Azure/azure…

…-rest-api-specs into network-july-release
Azure · Oct 13, 2020 · cc52d4a · cc52d4a
2 parents bf18c36 + 04e5da2
commit cc52d4a
Show file tree

Hide file tree

Showing 13 changed files with 43 additions and 19 deletions.
diff --git a/...network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/IpGroupsCreate.json b/...network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/IpGroupsCreate.json
@@ -36,7 +36,8 @@
             {
               "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azurefirewall"
             }
-          ]
+          ],
+          "firewallPolicies": []
         },
         "etag": "w/\\00000000-0000-0000-0000-000000000000\\"
       }
@@ -58,7 +59,8 @@
             {
               "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azurefirewall"
             }
-          ]
+          ],
+          "firewallPolicies": []
         },
         "etag": "w/\\00000000-0000-0000-0000-000000000000\\"
       }

diff --git a/...on/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/IpGroupsGet.json b/...on/network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/IpGroupsGet.json
@@ -23,7 +23,8 @@
             {
               "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azurefirewall"
             }
-          ]
+          ],
+          "firewallPolicies": []
         },
         "etag": "w/\\00000000-0000-0000-0000-000000000000\\"
       }

diff --git a/...rce-manager/Microsoft.Network/stable/2020-07-01/examples/IpGroupsListByResourceGroup.json b/...rce-manager/Microsoft.Network/stable/2020-07-01/examples/IpGroupsListByResourceGroup.json
@@ -24,7 +24,8 @@
                 {
                   "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azurefirewall"
                 }
-              ]
+              ],
+              "firewallPolicies": []
             },
             "etag": "w/\\00000000-0000-0000-0000-000000000000\\"
           },
@@ -44,7 +45,8 @@
                 {
                   "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azurefirewall"
                 }
-              ]
+              ],
+              "firewallPolicies": []
             },
             "etag": "w/\\00000000-0000-0000-0000-000000000000\\"
           }

diff --git a/...urce-manager/Microsoft.Network/stable/2020-07-01/examples/IpGroupsListBySubscription.json b/...urce-manager/Microsoft.Network/stable/2020-07-01/examples/IpGroupsListBySubscription.json
@@ -23,7 +23,8 @@
                 {
                   "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azurefirewall"
                 }
-              ]
+              ],
+              "firewallPolicies": []
             },
             "etag": "w/\\00000000-0000-0000-0000-000000000000\\"
           },
@@ -43,7 +44,8 @@
                 {
                   "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azurefirewall"
                 }
-              ]
+              ],
+              "firewallPolicies": []
             },
             "etag": "w/\\00000000-0000-0000-0000-000000000000\\"
           }

diff --git a/...ork/resource-manager/Microsoft.Network/stable/2020-07-01/examples/IpGroupsUpdateTags.json b/...ork/resource-manager/Microsoft.Network/stable/2020-07-01/examples/IpGroupsUpdateTags.json
@@ -33,7 +33,8 @@
             {
               "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azurefirewall"
             }
-          ]
+          ],
+          "firewallPolicies": []
         },
         "etag": "w/\\00000000-0000-0000-0000-000000000000\\"
       }

diff --git a/.../network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualHubGet.json b/.../network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualHubGet.json
@@ -27,7 +27,7 @@
             "10.10.1.12",
             "10.10.1.13"
           ],
-          "enableVirtualRouterRoutePropogation": false
+          "allowBranchToBranchTraffic": false
         }
       }
     }

diff --git a/...network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualHubList.json b/...network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualHubList.json
@@ -62,7 +62,7 @@
                 "10.10.1.12",
                 "10.10.1.13"
               ],
-              "enableVirtualRouterRoutePropogation": false
+              "allowBranchToBranchTraffic": false
             }
           },
           {
@@ -120,7 +120,7 @@
                 "10.10.1.12",
                 "10.10.1.13"
               ],
-              "enableVirtualRouterRoutePropogation": false
+              "allowBranchToBranchTraffic": false
             }
           }
         ]

diff --git a/...e-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualHubListByResourceGroup.json b/...e-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualHubListByResourceGroup.json
@@ -63,7 +63,7 @@
                 "10.10.1.12",
                 "10.10.1.13"
               ],
-              "enableVirtualRouterRoutePropogation": false
+              "allowBranchToBranchTraffic": false
             }
           },
           {
@@ -120,7 +120,8 @@
               "virtualRouterIps": [
                 "10.10.1.12",
                 "10.10.1.13"
-              ]
+              ],
+              "allowBranchToBranchTraffic": false
             }
           }
         ]

diff --git a/.../network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualHubPut.json b/.../network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualHubPut.json
@@ -40,7 +40,7 @@
             "10.10.1.12",
             "10.10.1.13"
           ],
-          "enableVirtualRouterRoutePropogation": false
+          "allowBranchToBranchTraffic": false
         }
       }
     },
@@ -65,7 +65,7 @@
             "10.10.1.12",
             "10.10.1.13"
           ],
-          "enableVirtualRouterRoutePropogation": false
+          "allowBranchToBranchTraffic": false
         }
       }
     }

diff --git a/...k/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualHubUpdateTags.json b/...k/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VirtualHubUpdateTags.json
@@ -36,7 +36,7 @@
             "10.10.1.12",
             "10.10.1.13"
           ],
-          "enableVirtualRouterRoutePropogation": false
+          "allowBranchToBranchTraffic": false
         }
       }
     }

diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/ipGroups.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/ipGroups.json
@@ -410,7 +410,15 @@
         "firewalls": {
           "type": "array",
           "readOnly": true,
-          "description": "List of references to Azure resources that this IpGroups is associated with.",
+          "description": "List of references to Firewall resources that this IpGroups is associated with.",
+          "items": {
+            "$ref": "./network.json#/definitions/SubResource"
+          }
+        },
+        "firewallPolicies": {
+          "type": "array",
+          "readOnly": true,
+          "description": "List of references to Firewall Policies resources that this IpGroups is associated with.",
           "items": {
             "$ref": "./network.json#/definitions/SubResource"
           }

diff --git a/...fication/network/resource-manager/Microsoft.Network/stable/2020-07-01/networkWatcher.json b/...fication/network/resource-manager/Microsoft.Network/stable/2020-07-01/networkWatcher.json
@@ -1569,6 +1569,13 @@
           },
           {
             "$ref": "./network.json#/parameters/SubscriptionIdParameter"
+          },
+          {
+            "name": "migrate",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "description": "Value indicating whether connection monitor V1 should be migrated to V2 format."
           }
         ],
         "responses": {

diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2020-07-01/virtualWan.json
@@ -5252,10 +5252,10 @@
             "type": "string"
           }
         },
-        "enableVirtualRouterRoutePropogation": {
+        "allowBranchToBranchTraffic": {
           "type": "boolean",
           "readOnly": false,
-          "description": "Flag to control route propogation for VirtualRouter hub."
+          "description": "Flag to control transit for VirtualRouter hub."
         }
       },
       "description": "Parameters for VirtualHub."
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,7 +23,8 @@ @@
                 {
                   "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/azureFirewalls/azurefirewall"
                 }
-              ]
+              ],
+              "firewallPolicies": []
             },
             "etag": "w/\\00000000-0000-0000-0000-000000000000\\"
           }
@@ Expand Down @@