Merging changes synced from https://github.com/MicrosoftDocs/azure-docs-pr (branch live)

tynevi · tynevi · commit cd11ccdd935c · 2019-07-08T10:06:48.000Z
diff --git a/articles/azure-functions/functions-reference-python.md b/articles/azure-functions/functions-reference-python.md
@@ -331,28 +331,66 @@ To build your dependencies and publish using a continuous delivery (CD) system,
 
 ## Unit Testing
 
-Functions written in Python can be tested like other Python code using standard testing frameworks. For most bindings, it's possible to create a mock input object by creating an instance of an appropriate class from the `azure.functions` package.
+Functions written in Python can be tested like other Python code using standard testing frameworks. For most bindings, it's possible to create a mock input object by creating an instance of an appropriate class from the `azure.functions` package. Since the [`azure.functions`](https://pypi.org/project/azure-functions/) package is not immediately available, be sure to install it via your `requirements.txt` file as described in [Python version and package management](#python-version-and-package-management) section above.
 
 For example, following is a mock test of an HTTP triggered function:
 
+```json
+{
+  "scriptFile": "httpfunc.py",
+  "entryPoint": "my_function",
+  "bindings": [
+    {
+      "authLevel": "function",
+      "type": "httpTrigger",
+      "direction": "in",
+      "name": "req",
+      "methods": [
+        "get",
+        "post"
+      ]
+    },
+    {
+      "type": "http",
+      "direction": "out",
+      "name": "$return"
+    }
+  ]
+}
+```
+
 ```python
-# myapp/__init__.py
+# myapp/httpfunc.py
 import azure.functions as func
 import logging
 
+def my_function(req: func.HttpRequest) -> func.HttpResponse:
+    logging.info('Python HTTP trigger function processed a request.')
 
-def main(req: func.HttpRequest,
-         obj: func.InputStream):
-
-    logging.info(f'Python HTTP triggered function processed: {obj.read()}')
+    name = req.params.get('name')
+    if not name:
+        try:
+            req_body = req.get_json()
+        except ValueError:
+            pass
+        else:
+            name = req_body.get('name')
+
+    if name:
+        return func.HttpResponse(f"Hello {name}")
+    else:
+        return func.HttpResponse(
+             "Please pass a name on the query string or in the request body",
+             status_code=400
+        )
 ```
 
 ```python
-# myapp/test_func.py
+# myapp/test_httpfunc.py
 import unittest
 
 import azure.functions as func
-from . import my_function
+from httpfunc import my_function
 
 
 class TestFunction(unittest.TestCase):
@@ -361,7 +399,7 @@ class TestFunction(unittest.TestCase):
         req = func.HttpRequest(
             method='GET',
             body=None,
-            url='/my_function',
+            url='/api/HttpTrigger',
             params={'name': 'Test'})
 
         # Call the function.
@@ -370,7 +408,7 @@ class TestFunction(unittest.TestCase):
         # Check the output.
         self.assertEqual(
             resp.get_body(),
-            'Hello, Test!',
+            b'Hello Test',
         )
 ```
 
diff --git a/articles/backup/backup-azure-backup-faq.md b/articles/backup/backup-azure-backup-faq.md
@@ -6,7 +6,7 @@ author: dcurwin
 manager: carmonm
 ms.service: backup
 ms.topic: conceptual
-ms.date: 01/08/2019
+ms.date: 07/07/2019
 ms.author: dacurwin
 ---
 
@@ -46,37 +46,6 @@ No. A Recovery Services vault can only change storage options before any backups
 - For the agent used to backup up Azure file folders, read this [FAQ](backup-azure-file-folder-backup-faq.md).
 
 
-## VMware and Hyper-V backup
-
-### Can I back up VMware vCenter servers to Azure?
-Yes. You can use Azure Backup Server to back up VMware vCenter Server and ESXi hosts to Azure.
-
-- [Learn more](backup-mabs-protection-matrix.md) about supported versions.
-- [Follow these steps](backup-azure-backup-server-vmware.md) to back up a VMware server.
-
-### Do I need a separate license to recover an full on-premises VMware/Hyper-V cluster?
-You don't need separate licensing for VMware/Hyper-V protection.
-
-- If you're a System Center customer, use System Center Data Protection Manager (DPM) to protect VMware VMs.
-- If you aren't a System Center customer, you can use Azure Backup Server (pay-as-you-go) to protect VMware VMs.
-
-## DPM and Azure Backup Server backup
-
-### Which DPM versions are supported?
-Supported DPM versions are summarized in the [support matrix](backup-azure-dpm-introduction.md#prerequisites-and-limitations). We recommend that you install the latest DPM updates, and run the [latest version](https://aka.ms/azurebackup_agent) of the Azure Backup agent on the DPM server.
-
-### Can I register the server to multiple vaults?
-No. A DPM or Azure Backup server can be registered to only one vault.
-
-### Can I use Azure Backup Server to create a Bare Metal Recovery (BMR) backup for a physical server? <br/>
-Yes.
-
-### Can I use DPM to back up apps in Azure Stack?
-No. You can use Azure Backup to protect Azure Stack, Azure Backup doesn't support using DPM to back up apps in Azure Stack.
-
-### If I've installed Azure Backup agent to protect my files and folders, can I install System Center DPM to back up on-premises workloads to Azure?
-Yes. But you should set up DPM first, and then install the Azure Backup agent.  Installing components in this order ensures that the Azure Backup agent works with DPM. Installing the agent before installing DPM isn't advised or supported.
-
 ## General backup
 
 ### Are there limits on backup scheduling?
@@ -113,7 +82,7 @@ For Azure VM Linux backups, Azure Backup supports [the list of distributions end
 Sizes limits are as follows:
 
 OS/machine | Size limit of data source
---- | --- 
+--- | ---
 Windows 8 or later | 54,400 GB
 Windows 7 |1700 GB
 Windows Server 2012 or later | 54,400 GB
diff --git a/articles/cosmos-db/how-to-manage-consistency.md b/articles/cosmos-db/how-to-manage-consistency.md
@@ -69,13 +69,7 @@ Consistency level can be set on a per request, which overrides the default consi
 
 ```csharp
 // Override consistency at the client level
-ConsistencyPolicy consistencyPolicy = new ConsistencyPolicy
-    {
-        DefaultConsistencyLevel = ConsistencyLevel.BoundedStaleness,
-        MaxStalenessIntervalInSeconds = 5,
-        MaxStalenessPrefix = 100
-    };
-documentClient = new DocumentClient(new Uri(endpoint), authKey, connectionPolicy, consistencyPolicy);
+documentClient = new DocumentClient(new Uri(endpoint), authKey, connectionPolicy, ConsistencyLevel.Eventual);
 
 // Override consistency at the request level via request options
 RequestOptions requestOptions = new RequestOptions { ConsistencyLevel = ConsistencyLevel.Strong };
diff --git a/articles/expressroute/expressroute-howto-routing-portal-resource-manager.md b/articles/expressroute/expressroute-howto-routing-portal-resource-manager.md
@@ -128,6 +128,7 @@ This section helps you create, get, update, and delete the Azure private peering
    * A /30 subnet for the secondary link. The subnet must not be part of any address space reserved for virtual networks. From this subnet you will assign the first useable IP address to your router as Microsoft uses the second useable IP for its router.
    * A valid VLAN ID to establish this peering on. Ensure that no other peering in the circuit uses the same VLAN ID. For both Primary and Secondary links you must use the same VLAN ID.
    * AS number for peering. You can use both 2-byte and 4-byte AS numbers. You can use a private AS number for this peering except for the number from 65515 to 65520, inclusively.
+   * You must advertise the routes from your on-premises Edge router to Azure via BGP when you set up the private peering.
    * **Optional -** An MD5 hash if you choose to use one.
 3. Select the Azure private peering row, as shown in the following example:
 
diff --git a/articles/iot-central/howto-set-up-template.md b/articles/iot-central/howto-set-up-template.md
@@ -146,7 +146,7 @@ assetloc: {
 
 ## Settings
 
-Settings control a device. They enable operators to provide inputs to the device. You can add multiple settings to your device template that appear as tiles on the **Settings** tab for operators to use. You can add many types of settings: number, text, date, toggle, pick list, and section label.
+Settings control a device. They enable operators to provide inputs to the device. You can add multiple settings to your device template that appear as tiles on the **Settings** tab for operators to use. You can add many types of settings: number, text, date, toggle, and section label.
 
 Settings can be in one of three states. The device reports these states.
 
diff --git a/articles/machine-learning/service/tutorial-auto-train-models.md b/articles/machine-learning/service/tutorial-auto-train-models.md
@@ -1125,6 +1125,8 @@ print(y_predict[:10])
 Create a scatter plot to visualize the predicted cost values compared to the actual cost values. The following code uses the `distance` feature as the x-axis and trip `cost` as the y-axis. To compare the variance of predicted cost at each trip distance value, the first 100 predicted and actual cost values are created as separate series. Examining the plot shows that the distance/cost relationship is nearly linear, and the predicted cost values are in most cases very close to the actual cost values for the same trip distance.
 
 ```python
+%matplotlib inline
+
 import matplotlib.pyplot as plt
 
 fig = plt.figure(figsize=(14, 10))
