Merge branch 'master' of https://github.com/Azure/azure-sdk-for-python into add_warnings

* 'master' of https://github.com/Azure/azure-sdk-for-python:
  Implementation for Datasources operations (#11012)
  rename SearchIndexClient -> SearchClient (#10964)
  Servicebus - Track2 - Remove timeout from Send (#11002)
  Fixing compute test (#11036)
  fixing merge error (#11039)
  Update Ubuntu VM Image to 18.04 (#11032)
  add regular endpoint in new env variable (#11031)

Author: iscai-msft

eng/pipelines/autorest_checks.yml

@@ -25,7 +25,7 @@ jobs:
     displayName: 'Run AutoRest'
 
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-18.04'
 
     steps:
       - task: NodeTool@0

eng/pipelines/generate-all-docs.yml

@@ -19,7 +19,7 @@ jobs:
     timeoutInMinutes: 120
 
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-18.04'
 
     steps:
       - task: UsePythonVersion@0

eng/pipelines/templates/jobs/archetype-sdk-client.yml

@@ -10,31 +10,31 @@ parameters:
   TestMatrix:
     Linux_Python27:
       OSName: 'Linux'
-      OSVmImage: 'ubuntu-16.04'
+      OSVmImage: 'ubuntu-18.04'
       PythonVersion: '2.7'
       CoverageArg: ''
       RunForPR: true
     Linux_Python35:
       OSName: 'Linux'
-      OSVmImage: 'ubuntu-16.04'
+      OSVmImage: 'ubuntu-18.04'
       PythonVersion: '3.5'
       CoverageArg: ''
       RunForPR: false
     Linux_Python36:
       OSName: 'Linux'
-      OSVmImage: 'ubuntu-16.04'
+      OSVmImage: 'ubuntu-18.04'
       PythonVersion: '3.6'
       CoverageArg: ''
       RunForPR: false
     Linux_Python37:
       OSName: 'Linux'
-      OSVmImage: 'ubuntu-16.04'
+      OSVmImage: 'ubuntu-18.04'
       PythonVersion: '3.7'
       CoverageArg: ''
       RunForPR: false
     Linux_Python38:
       OSName: 'Linux'
-      OSVmImage: 'ubuntu-16.04'
+      OSVmImage: 'ubuntu-18.04'
       PythonVersion: '3.8'
       CoverageArg: ''
       RunForPR: true
@@ -52,7 +52,7 @@ parameters:
       RunForPR: false
     Linux_pypy3:
       OSName: 'Linux'
-      OSVmImage: 'ubuntu-16.04'
+      OSVmImage: 'ubuntu-18.04'
       PythonVersion: 'pypy3'
       CoverageArg: '--disablecov'
       RunForPR: false
@@ -64,7 +64,7 @@ jobs:
     - template: ../variables/globals.yml
 
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-18.04'
 
     steps:
     - template: ../steps/build-artifacts.yml
@@ -83,7 +83,7 @@ jobs:
       - 'Build'
 
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-18.04'
 
     steps:
     - template: ../steps/analyze.yml
@@ -156,7 +156,7 @@ jobs:
       - 'Build'
 
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-18.04'
 
     steps:
     - template: ../steps/run_mypy.yml
@@ -175,7 +175,7 @@ jobs:
       - 'Build'
 
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-18.04'
 
     steps:
     - template: ../steps/run_pylint.yml
@@ -194,7 +194,7 @@ jobs:
       - 'Build'
 
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-18.04'
 
     steps:
     - template: ../steps/test_regression.yml

eng/pipelines/templates/jobs/archetype-sdk-tests.yml

@@ -15,7 +15,7 @@ parameters:
   Matrix:
     Linux_Python35:
       OSName: 'Linux'
-      OSVmImage: 'ubuntu-16.04'
+      OSVmImage: 'ubuntu-18.04'
       PythonVersion: '3.5'
     MacOs_Python37:
       OSName: 'MacOS'
@@ -27,11 +27,11 @@ parameters:
       PythonVersion: '2.7'
     Linux_PyPy3:
       OSName: 'Linux'
-      OSVmImage: 'ubuntu-16.04'
+      OSVmImage: 'ubuntu-18.04'
       PythonVersion: 'pypy3'
     Linux_Python38:
       OSName: 'Linux'
-      OSVmImage: 'ubuntu-16.04'
+      OSVmImage: 'ubuntu-18.04'
       PythonVersion: '3.8'
 
 jobs:

eng/pipelines/templates/jobs/tests-nightly-python.yml

@@ -10,7 +10,7 @@ jobs:
     timeoutInMinutes: 90
 
     pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-18.04'
 
     steps:
       - task: UsePythonVersion@0

eng/pipelines/templates/stages/archetype-python-release.yml

@@ -18,7 +18,7 @@ stages:
             environment: github
 
             pool:
-              vmImage: ubuntu-16.04
+              vmImage: ubuntu-18.04
 
             strategy:
               runOnce:
@@ -50,7 +50,7 @@ stages:
               dependsOn: TagRepository
 
               pool:
-                vmImage: ubuntu-16.04
+                vmImage: ubuntu-18.04
 
               strategy:
                 runOnce:
@@ -132,7 +132,7 @@ stages:
               dependsOn: PublishPackage
 
               pool:
-                vmImage: ubuntu-16.04
+                vmImage: ubuntu-18.04
 
               strategy:
                 runOnce:
@@ -164,7 +164,7 @@ stages:
       variables:
         devFeedName: public/azure-sdk-for-python
       pool:
-        vmImage: ubuntu-16.04
+        vmImage: ubuntu-18.04
       steps:
       - checkout: none
       - download: current

sdk/compute/azure-mgmt-compute/setup.py

@@ -36,7 +36,9 @@
     pass
 
 # Version extraction inspired from 'requests'
-with open(os.path.join(package_folder_path, 'version.py'), 'r') as fd:
+with open(os.path.join(package_folder_path, 'version.py') 
+          if os.path.exists(os.path.join(package_folder_path, 'version.py'))
+          else os.path.join(package_folder_path, '_version.py'), 'r') as fd:
     version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]',
                         fd.read(), re.MULTILINE).group(1)
 

sdk/compute/azure-mgmt-compute/tests/test_cli_mgmt_compute.py

@@ -187,10 +187,13 @@ def test_compute(self, resource_group):
         INSTANCE_IDS = ["1"]
         LOG_ANALYTIC_NAME = "loganalytic"
 
-
-        SUBNET = self.create_virtual_network(RESOURCE_GROUP, AZURE_LOCATION, NETWORK_NAME, SUBNET_NAME)
-        NIC_ID = self.create_network_interface(RESOURCE_GROUP, AZURE_LOCATION, INTERFACE_NAME, SUBNET)
-        # VAULT_ID, VAULT_URL, KEY_NAME = self.create_key(RESOURCE_GROUP, AZURE_LOCATION, KEY_VAULT, TENANT_ID)
+        if self.is_live:
+          SUBNET = self.create_virtual_network(RESOURCE_GROUP, AZURE_LOCATION, NETWORK_NAME, SUBNET_NAME)
+          NIC_ID = self.create_network_interface(RESOURCE_GROUP, AZURE_LOCATION, INTERFACE_NAME, SUBNET)
+          # VAULT_ID, VAULT_URL, KEY_NAME = self.create_key(RESOURCE_GROUP, AZURE_LOCATION, KEY_VAULT, TENANT_ID)
+        else:
+          SUBNET = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/" + RESOURCE_GROUP + "/providers/Microsoft.Network/virtualNetworks/" + NETWORK_NAME + "/subnets/" + SUBNET_NAME
+          NIC_ID = "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/" + RESOURCE_GROUP + "/providers/Microsoft.Network/networkInterfaces/" + INTERFACE_NAME
 
         # Create an empty managed disk.[put]
         BODY = {

sdk/compute/azure-mgmt-compute/tests/test_mgmt_compute.py

@@ -5,6 +5,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 #--------------------------------------------------------------------------
+
 import unittest
 
 from collections import namedtuple