Revert images to previous API version (#4931)

Azure · Apr 22, 2019 · 21fda3c · 21fda3c
1 parent ca9dba4
commit 21fda3c
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 8 deletions.
diff --git a/azure-mgmt-compute/HISTORY.rst b/azure-mgmt-compute/HISTORY.rst
@@ -2,10 +2,19 @@
 
 Release History
 ===============
+
+4.6.2 (2019-04-22)
+++++++++++++++++++
+
+**Bugfix**
+
+- Revert "images" API version introduced in 4.6.0 from 2019-03-01 to 2018-10-01 for backward compatiblity #4891
+
 4.6.1 (2019-04-18)
 ++++++++++++++++++
 
 **Bugfixes**
+
 - Make enum declarations in Compute package consistent, for the sake of code inspection.
 
 4.6.0 (2019-04-12)

diff --git a/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
@@ -87,6 +87,7 @@ class ComputeManagementClient(MultiApiClientMixin, SDKClient):
             'resource_skus': '2017-09-01',
             'disks': '2018-09-30',
             'snapshots': '2018-09-30',
+            'images': '2018-10-01',
             'proximity_placement_groups': '2018-10-01',
             None: DEFAULT_API_VERSION
         }},

diff --git a/azure-mgmt-compute/azure/mgmt/compute/models.py b/azure-mgmt-compute/azure/mgmt/compute/models.py
@@ -7,8 +7,8 @@
 import warnings
 
 from .v2017_09_01.models import *
-from .v2018_10_01.models import *
 from .v2018_09_30.models import *
+from .v2018_10_01.models import *
 from .v2019_03_01.models import * # Note that this line is overriding some models of 2018-09-01. See link below for details.
 
 warnings.warn("Import models from this file is deprecated. See https://aka.ms/pysdkmodels",

diff --git a/azure-mgmt-compute/azure/mgmt/compute/version.py b/azure-mgmt-compute/azure/mgmt/compute/version.py
@@ -5,4 +5,4 @@
 # license information.
 # --------------------------------------------------------------------------
 
-VERSION = "4.6.1"
+VERSION = "4.6.2"
diff --git a/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_create_image_from_blob.yaml b/azure-mgmt-compute/tests/recordings/test_mgmt_managed_disks.test_create_image_from_blob.yaml
@@ -14,7 +14,7 @@ interactions:
       accept-language: [en-US]
       x-ms-client-request-id: [aaefdaec-5d36-11e7-af9e-ecb1d756380e]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_image_from_blob1cfb14b2/providers/Microsoft.Compute/images/myImage?api-version=2019-03-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_image_from_blob1cfb14b2/providers/Microsoft.Compute/images/myImage?api-version=2018-10-01
   response:
     body: {string: "{\r\n  \"properties\": {\r\n    \"storageProfile\": {\r\n      \"osDisk\":
         {\r\n        \"osType\": \"Linux\",\r\n        \"osState\": \"Generalized\",\r\n
@@ -24,7 +24,7 @@ interactions:
         \ \"location\": \"westus\",\r\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_image_from_blob1cfb14b2/providers/Microsoft.Compute/images/myImage\",\r\n
         \ \"name\": \"myImage\"\r\n}"}
     headers:
-      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/53c76029-51ee-40c5-843a-3ab96eba05f4?api-version=2019-03-01']
+      Azure-AsyncOperation: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/53c76029-51ee-40c5-843a-3ab96eba05f4?api-version=2018-10-01']
       Cache-Control: [no-cache]
       Content-Length: ['622']
       Content-Type: [application/json; charset=utf-8]
@@ -51,7 +51,7 @@ interactions:
       accept-language: [en-US]
       x-ms-client-request-id: [aaefdaec-5d36-11e7-af9e-ecb1d756380e]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/53c76029-51ee-40c5-843a-3ab96eba05f4?api-version=2019-03-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.Compute/locations/westus/operations/53c76029-51ee-40c5-843a-3ab96eba05f4?api-version=2018-10-01
   response:
     body: {string: "{\r\n  \"startTime\": \"2017-06-30T01:51:43.9432726+00:00\",\r\n
         \ \"endTime\": \"2017-06-30T01:52:04.5545491+00:00\",\r\n  \"status\": \"Succeeded\",\r\n
@@ -85,7 +85,7 @@ interactions:
       accept-language: [en-US]
       x-ms-client-request-id: [aaefdaec-5d36-11e7-af9e-ecb1d756380e]
     method: GET
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_image_from_blob1cfb14b2/providers/Microsoft.Compute/images/myImage?api-version=2019-03-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_mgmt_managed_disks_test_create_image_from_blob1cfb14b2/providers/Microsoft.Compute/images/myImage?api-version=2018-10-01
   response:
     body: {string: "{\r\n  \"properties\": {\r\n    \"storageProfile\": {\r\n      \"osDisk\":
         {\r\n        \"osType\": \"Linux\",\r\n        \"osState\": \"Generalized\",\r\n

diff --git a/azure-mgmt-compute/tests/test_mgmt_managed_disks.py b/azure-mgmt-compute/tests/test_mgmt_managed_disks.py
@@ -93,7 +93,7 @@ def test_md_from_storage_blob(self, resource_group, location):
                 'location': location,
                 'creation_data': {
                     'create_option': DiskCreateOption.import_enum,
-                    'source_uri': 'https://mystorageaccount.blob.core.windows.net/inputtestdatadonotdelete/ubuntu.vhd'
+                    'source_uri': self.settings.LINUX_OS_VHD  # 'https://mystorageaccount.blob.core.windows.net/inputtestdatadonotdelete/ubuntu.vhd'
                 }
             }
         )
@@ -275,7 +275,7 @@ def test_create_image_from_blob(self, resource_group, location):
                     'os_disk': {
                         'os_type': 'Linux',
                         'os_state': "Generalized",
-                        'blob_uri': 'https://mystorageaccount.blob.core.windows.net/inputtestdatadonotdelete/ubuntu.vhd',
+                        'blob_uri': self.settings.LINUX_OS_VHD,  # 'https://mystorageaccount.blob.core.windows.net/inputtestdatadonotdelete/ubuntu.vhd'
                         'caching': "ReadWrite",
                     }
                 }

diff --git a/azure-sdk-tools/devtools_testutils/mgmt_settings_fake.py b/azure-sdk-tools/devtools_testutils/mgmt_settings_fake.py
@@ -26,6 +26,9 @@
 HDI_ADLS_ACCOUNT_NAME = 'fakehdiadlsaccount'
 HDI_ADLS_CLIENT_ID = '00000000-0000-0000-0000-000000000000'
 
+# Ubuntu image
+LINUX_OS_VHD = "https://mystorageaccount.blob.core.windows.net/inputtestdatadonotdelete/ubuntu.vhd"
+
 # Read for details of this file:
 # https://github.com/Azure/azure-sdk-for-python/wiki/Contributing-to-the-tests