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

…-rest-api-specs into network-july-release
litchiyangMSFT · Oct 16, 2020 · f99609c · f99609c
2 parents 395fb88 + dc2bf06
commit f99609c
Show file tree

Hide file tree

Showing 14 changed files with 50 additions and 21 deletions.
diff --git a/...twork/resource-manager/Microsoft.Network/stable/2020-07-01/examples/P2SVpnGatewayGet.json b/...twork/resource-manager/Microsoft.Network/stable/2020-07-01/examples/P2SVpnGatewayGet.json
@@ -49,7 +49,8 @@
             ],
             "totalIngressBytesTransferred": 2000,
             "totalEgressBytesTransferred": 3000
-          }
+          },
+          "isRoutingPreferenceInternet": false
         }
       }
     }

diff --git a/...anager/Microsoft.Network/stable/2020-07-01/examples/P2SVpnGatewayGetConnectionHealth.json b/...anager/Microsoft.Network/stable/2020-07-01/examples/P2SVpnGatewayGetConnectionHealth.json
@@ -49,7 +49,8 @@
             ],
             "totalIngressBytesTransferred": 2000,
             "totalEgressBytesTransferred": 3000
-          }
+          },
+          "isRoutingPreferenceInternet": false
         }
       }
     },

diff --git a/...work/resource-manager/Microsoft.Network/stable/2020-07-01/examples/P2SVpnGatewayList.json b/...work/resource-manager/Microsoft.Network/stable/2020-07-01/examples/P2SVpnGatewayList.json
@@ -50,7 +50,8 @@
                 ],
                 "totalIngressBytesTransferred": 2000,
                 "totalEgressBytesTransferred": 3000
-              }
+              },
+              "isRoutingPreferenceInternet": false
             }
           },
           {
@@ -95,7 +96,8 @@
                 ],
                 "totalIngressBytesTransferred": 2000,
                 "totalEgressBytesTransferred": 3000
-              }
+              },
+              "isRoutingPreferenceInternet": false
             }
           }
         ]

diff --git a/...anager/Microsoft.Network/stable/2020-07-01/examples/P2SVpnGatewayListByResourceGroup.json b/...anager/Microsoft.Network/stable/2020-07-01/examples/P2SVpnGatewayListByResourceGroup.json
@@ -48,7 +48,8 @@
                 ],
                 "totalIngressBytesTransferred": 2000,
                 "totalEgressBytesTransferred": 3000
-              }
+              },
+              "isRoutingPreferenceInternet": false
             }
           },
           {
@@ -91,7 +92,8 @@
                 ],
                 "totalIngressBytesTransferred": 2000,
                 "totalEgressBytesTransferred": 3000
-              }
+              },
+              "isRoutingPreferenceInternet": false
             }
           }
         ]

diff --git a/...twork/resource-manager/Microsoft.Network/stable/2020-07-01/examples/P2SVpnGatewayPut.json b/...twork/resource-manager/Microsoft.Network/stable/2020-07-01/examples/P2SVpnGatewayPut.json
@@ -33,7 +33,8 @@
         "customDnsServers": [
           "1.1.1.1",
           "2.2.2.2"
-        ]
+        ],
+        "isRoutingPreferenceInternet": false
       }
     }
   },
@@ -79,7 +80,8 @@
             "allocatedIpAddresses": [],
             "totalIngressBytesTransferred": 0,
             "totalEgressBytesTransferred": 0
-          }
+          },
+          "isRoutingPreferenceInternet": false
         }
       }
     },
@@ -124,7 +126,8 @@
             "allocatedIpAddresses": [],
             "totalIngressBytesTransferred": 0,
             "totalEgressBytesTransferred": 0
-          }
+          },
+          "isRoutingPreferenceInternet": false
         }
       }
     }

diff --git a/...ork/resource-manager/Microsoft.Network/stable/2020-07-01/examples/P2SVpnGatewayReset.json b/...ork/resource-manager/Microsoft.Network/stable/2020-07-01/examples/P2SVpnGatewayReset.json
@@ -50,7 +50,8 @@
             ],
             "totalIngressBytesTransferred": 2000,
             "totalEgressBytesTransferred": 3000
-          }
+          },
+          "isRoutingPreferenceInternet": false
         }
       }
     }

diff --git a/...esource-manager/Microsoft.Network/stable/2020-07-01/examples/P2SVpnGatewayUpdateTags.json b/...esource-manager/Microsoft.Network/stable/2020-07-01/examples/P2SVpnGatewayUpdateTags.json
@@ -58,7 +58,8 @@
             ],
             "totalIngressBytesTransferred": 2000,
             "totalEgressBytesTransferred": 3000
-          }
+          },
+          "isRoutingPreferenceInternet": false
         }
       }
     }

diff --git a/.../network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VpnGatewayGet.json b/.../network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VpnGatewayGet.json
@@ -137,7 +137,8 @@
                 ]
               }
             ]
-          }
+          },
+          "isRoutingPreferenceInternet": false
         }
       }
     }

diff --git a/...network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VpnGatewayList.json b/...network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VpnGatewayList.json
@@ -138,7 +138,8 @@
                     ]
                   }
                 ]
-              }
+              },
+              "isRoutingPreferenceInternet": false
             }
           },
           {
@@ -229,7 +230,8 @@
                     ]
                   }
                 ]
-              }
+              },
+              "isRoutingPreferenceInternet": false
             }
           }
         ]

diff --git a/...e-manager/Microsoft.Network/stable/2020-07-01/examples/VpnGatewayListByResourceGroup.json b/...e-manager/Microsoft.Network/stable/2020-07-01/examples/VpnGatewayListByResourceGroup.json
@@ -138,7 +138,8 @@
                     ]
                   }
                 ]
-              }
+              },
+              "isRoutingPreferenceInternet": false
             }
           },
           {
@@ -229,7 +230,8 @@
                     ]
                   }
                 ]
-              }
+              },
+              "isRoutingPreferenceInternet": false
             }
           }
         ]

diff --git a/.../network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VpnGatewayPut.json b/.../network/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VpnGatewayPut.json
@@ -53,7 +53,8 @@
               ]
             }
           ]
-        }
+        },
+        "isRoutingPreferenceInternet": false
       }
     }
   },
@@ -166,7 +167,8 @@
                 ]
               }
             ]
-          }
+          },
+          "isRoutingPreferenceInternet": false
         }
       }
     },
@@ -278,7 +280,8 @@
                 ]
               }
             ]
-          }
+          },
+          "isRoutingPreferenceInternet": false
         }
       }
     }

diff --git a/...etwork/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VpnGatewayReset.json b/...etwork/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VpnGatewayReset.json
@@ -96,7 +96,8 @@
                 ]
               }
             ]
-          }
+          },
+          "isRoutingPreferenceInternet": false
         }
       }
     }

diff --git a/...k/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VpnGatewayUpdateTags.json b/...k/resource-manager/Microsoft.Network/stable/2020-07-01/examples/VpnGatewayUpdateTags.json
@@ -104,7 +104,8 @@
                 ]
               }
             ]
-          }
+          },
+          "isRoutingPreferenceInternet": false
         }
       }
     }

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
@@ -5673,6 +5673,10 @@
           "items": {
             "$ref": "#/definitions/VpnGatewayIpConfiguration"
           }
+        },
+        "isRoutingPreferenceInternet": {
+          "type": "boolean",
+          "description": "Enable Routing Preference property for the Public IP Interface of the VpnGateway."
         }
       },
       "description": "Parameters for VpnGateway."
@@ -6640,6 +6644,10 @@
           "items": {
             "type": "string"
           }
+        },
+        "isRoutingPreferenceInternet": {
+          "type": "boolean",
+          "description": "Enable Routing Preference property for the Public IP Interface of the P2SVpnGateway."
         }
       },
       "description": "Parameters for P2SVpnGateway."
-Original file line number
+Diff line change
@@ Expand Up / @@ -49,7 +49,8 @@ @@
                 ],
                 "totalIngressBytesTransferred": 2000,
                 "totalEgressBytesTransferred": 3000
-              }
+              },
+              "isRoutingPreferenceInternet": false
             }
           }
         }
@@ Expand Down @@