HubRoutingPreference in VirtualHub (Azure#17609)

Khushboo-Baheti · Khushboo Baheti · HappyTobi · commit cbe1b572b6d8 · 2022-02-18T16:11:33.000+01:00
* commit1

* commit2

Co-authored-by: Khushboo Baheti &lt;khbaheti@microsoft.com&gt;
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/examples/VirtualHubGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/examples/VirtualHubGet.json
@@ -28,7 +28,8 @@
             "10.10.1.13"
           ],
           "allowBranchToBranchTraffic": false,
-          "preferredRoutingGateway": "ExpressRoute"
+          "preferredRoutingGateway": "ExpressRoute",
+          "hubRoutingPreference": "ExpressRoute"
         }
       }
     }
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/examples/VirtualHubList.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/examples/VirtualHubList.json
@@ -63,7 +63,8 @@
                 "10.10.1.13"
               ],
               "allowBranchToBranchTraffic": false,
-              "preferredRoutingGateway": "ExpressRoute"
+              "preferredRoutingGateway": "ExpressRoute",
+              "hubRoutingPreference": "ExpressRoute"
             }
           },
           {
@@ -122,7 +123,8 @@
                 "10.10.1.13"
               ],
               "allowBranchToBranchTraffic": false,
-              "preferredRoutingGateway": "ExpressRoute"
+              "preferredRoutingGateway": "ExpressRoute",
+              "hubRoutingPreference": "ExpressRoute"
             }
           }
         ]
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/examples/VirtualHubListByResourceGroup.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/examples/VirtualHubListByResourceGroup.json
@@ -64,7 +64,8 @@
                 "10.10.1.13"
               ],
               "allowBranchToBranchTraffic": false,
-              "preferredRoutingGateway": "ExpressRoute"
+              "preferredRoutingGateway": "ExpressRoute",
+              "hubRoutingPreference": "ExpressRoute"
             }
           },
           {
@@ -123,7 +124,8 @@
                 "10.10.1.13"
               ],
               "allowBranchToBranchTraffic": false,
-              "preferredRoutingGateway": "ExpressRoute"
+              "preferredRoutingGateway": "ExpressRoute",
+              "hubRoutingPreference": "ExpressRoute"
             }
           }
         ]
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/examples/VirtualHubPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/examples/VirtualHubPut.json
@@ -41,7 +41,8 @@
             "10.10.1.13"
           ],
           "allowBranchToBranchTraffic": false,
-          "preferredRoutingGateway": "ExpressRoute"
+          "preferredRoutingGateway": "ExpressRoute",
+          "hubRoutingPreference": "ExpressRoute"
         }
       }
     },
@@ -67,7 +68,8 @@
             "10.10.1.13"
           ],
           "allowBranchToBranchTraffic": false,
-          "preferredRoutingGateway": "ExpressRoute"
+          "preferredRoutingGateway": "ExpressRoute",
+          "hubRoutingPreference": "ExpressRoute"
         }
       }
     }
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/examples/VirtualHubUpdateTags.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/examples/VirtualHubUpdateTags.json
@@ -36,7 +36,8 @@
             "10.10.1.12",
             "10.10.1.13"
           ],
-          "allowBranchToBranchTraffic": false
+          "allowBranchToBranchTraffic": false,
+          "hubRoutingPreference": "ExpressRoute"
         }
       }
     }
diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2021-08-01/virtualWan.json
@@ -6047,6 +6047,10 @@
         "preferredRoutingGateway": {
           "$ref": "#/definitions/PreferredRoutingGateway",
           "description": "The preferred gateway to route on-prem traffic"
+        },
+        "hubRoutingPreference": {
+          "$ref": "#/definitions/HubRoutingPreference",
+          "description": "The hubRoutingPreference of this VirtualHub."
         }
       },
       "description": "Parameters for VirtualHub."
@@ -6064,6 +6068,19 @@
         "modelAsString": true
       }
     },
+    "HubRoutingPreference": {
+      "type": "string",
+      "description": "The hub routing preference gateway types",
+      "enum": [
+        "ExpressRoute",
+        "VpnGateway",
+        "ASPath"
+      ],
+      "x-ms-enum": {
+        "name": "HubRoutingPreference",
+        "modelAsString": true
+      }
+    },
     "RoutingState": {
       "type": "string",
       "description": "The current routing state of the VirtualHub.",

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,8 @@`
`28`	`28`	`"10.10.1.13"`
`29`	`29`	`],`
`30`	`30`	`"allowBranchToBranchTraffic": false,`
`31`		`- "preferredRoutingGateway": "ExpressRoute"`
	`31`	`+ "preferredRoutingGateway": "ExpressRoute",`
	`32`	`+ "hubRoutingPreference": "ExpressRoute"`
`32`	`33`	`}`
`33`	`34`	`}`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,8 @@`
`63`	`63`	`"10.10.1.13"`
`64`	`64`	`],`
`65`	`65`	`"allowBranchToBranchTraffic": false,`
`66`		`- "preferredRoutingGateway": "ExpressRoute"`
	`66`	`+ "preferredRoutingGateway": "ExpressRoute",`
	`67`	`+ "hubRoutingPreference": "ExpressRoute"`
`67`	`68`	`}`
`68`	`69`	`},`
`69`	`70`	`{`
`@@ -122,7 +123,8 @@`
`122`	`123`	`"10.10.1.13"`
`123`	`124`	`],`
`124`	`125`	`"allowBranchToBranchTraffic": false,`
`125`		`- "preferredRoutingGateway": "ExpressRoute"`
	`126`	`+ "preferredRoutingGateway": "ExpressRoute",`
	`127`	`+ "hubRoutingPreference": "ExpressRoute"`
`126`	`128`	`}`
`127`	`129`	`}`
`128`	`130`	`]`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,8 @@`
`64`	`64`	`"10.10.1.13"`
`65`	`65`	`],`
`66`	`66`	`"allowBranchToBranchTraffic": false,`
`67`		`- "preferredRoutingGateway": "ExpressRoute"`
	`67`	`+ "preferredRoutingGateway": "ExpressRoute",`
	`68`	`+ "hubRoutingPreference": "ExpressRoute"`
`68`	`69`	`}`
`69`	`70`	`},`
`70`	`71`	`{`
`@@ -123,7 +124,8 @@`
`123`	`124`	`"10.10.1.13"`
`124`	`125`	`],`
`125`	`126`	`"allowBranchToBranchTraffic": false,`
`126`		`- "preferredRoutingGateway": "ExpressRoute"`
	`127`	`+ "preferredRoutingGateway": "ExpressRoute",`
	`128`	`+ "hubRoutingPreference": "ExpressRoute"`
`127`	`129`	`}`
`128`	`130`	`}`
`129`	`131`	`]`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,8 @@`
`41`	`41`	`"10.10.1.13"`
`42`	`42`	`],`
`43`	`43`	`"allowBranchToBranchTraffic": false,`
`44`		`- "preferredRoutingGateway": "ExpressRoute"`
	`44`	`+ "preferredRoutingGateway": "ExpressRoute",`
	`45`	`+ "hubRoutingPreference": "ExpressRoute"`
`45`	`46`	`}`
`46`	`47`	`}`
`47`	`48`	`},`
`@@ -67,7 +68,8 @@`
`67`	`68`	`"10.10.1.13"`
`68`	`69`	`],`
`69`	`70`	`"allowBranchToBranchTraffic": false,`
`70`		`- "preferredRoutingGateway": "ExpressRoute"`
	`71`	`+ "preferredRoutingGateway": "ExpressRoute",`
	`72`	`+ "hubRoutingPreference": "ExpressRoute"`
`71`	`73`	`}`
`72`	`74`	`}`
`73`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@`
`36`	`36`	`"10.10.1.12",`
`37`	`37`	`"10.10.1.13"`
`38`	`38`	`],`
`39`		`- "allowBranchToBranchTraffic": false`
	`39`	`+ "allowBranchToBranchTraffic": false,`
	`40`	`+ "hubRoutingPreference": "ExpressRoute"`
`40`	`41`	`}`
`41`	`42`	`}`
`42`	`43`	`}`