[AutoPR keyvault/resource-manager] Mgmt swagger fixes

azure-mgmt-keyvault/azure/mgmt/keyvault/models/vault_properties.py

@@ -15,9 +15,6 @@
 class VaultProperties(Model):
     """Properties of the vault.
 
-    Variables are only populated by the server, and will be ignored when
-    sending a request.
-
     :param tenant_id: The Azure Active Directory tenant ID that should be used
      for authenticating requests to the key vault.
     :type tenant_id: str
@@ -27,9 +24,9 @@ class VaultProperties(Model):
      the key vault. All identities in the array must use the same tenant ID as
      the key vault's tenant ID.
     :type access_policies: list[~azure.mgmt.keyvault.models.AccessPolicyEntry]
-    :ivar vault_uri: The URI of the vault for performing operations on keys
+    :param vault_uri: The URI of the vault for performing operations on keys
      and secrets.
-    :vartype vault_uri: str
+    :type vault_uri: str
     :param enabled_for_deployment: Property to specify whether Azure Virtual
      Machines are permitted to retrieve certificates stored as secrets from the
      key vault.
@@ -64,7 +61,6 @@ class VaultProperties(Model):
     _validation = {
         'tenant_id': {'required': True},
         'sku': {'required': True},
-        'vault_uri': {'readonly': True},
     }
 
     _attribute_map = {
@@ -81,12 +77,12 @@ class VaultProperties(Model):
         'network_acls': {'key': 'networkAcls', 'type': 'NetworkRuleSet'},
     }
 
-    def __init__(self, tenant_id, sku, access_policies=None, enabled_for_deployment=None, enabled_for_disk_encryption=None, enabled_for_template_deployment=None, enable_soft_delete=None, create_mode=None, enable_purge_protection=None, network_acls=None):
+    def __init__(self, tenant_id, sku, access_policies=None, vault_uri=None, enabled_for_deployment=None, enabled_for_disk_encryption=None, enabled_for_template_deployment=None, enable_soft_delete=None, create_mode=None, enable_purge_protection=None, network_acls=None):
         super(VaultProperties, self).__init__()
         self.tenant_id = tenant_id
         self.sku = sku
         self.access_policies = access_policies
-        self.vault_uri = None
+        self.vault_uri = vault_uri
         self.enabled_for_deployment = enabled_for_deployment
         self.enabled_for_disk_encryption = enabled_for_disk_encryption
         self.enabled_for_template_deployment = enabled_for_template_deployment

azure-mgmt-keyvault/azure/mgmt/keyvault/version.py

@@ -9,5 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "2018-02-14-preview"
+VERSION = "1.0.0a2"
 

azure-mgmt/tests/keyvault_testcase.py

@@ -199,10 +199,7 @@ def create_vault(self, group_name, vault_name, permissions=None, enabled_for_dep
         parameters = VaultCreateOrUpdateParameters(location='westus',
                                                    properties=properties)
 
-        vault = self.mgmt_client.vaults.create_or_update(group_name, vault_name, parameters)
-
-        if not self.is_playback():
-            self.sleep(10)
+        vault = self.mgmt_client.vaults.create_or_update(group_name, vault_name, parameters).result()
 
         return vault
 

azure-mgmt/tests/recordings/test_key_vault_data.test_certificate_async_request_cancellation_and_deletion.yaml

@@ -54,7 +54,7 @@ interactions:
       accept-language: [en-US]
       x-ms-client-request-id: [32e5a61e-4ad6-11e7-88f6-5065f34efe31]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/azkv-pytest/providers/Microsoft.KeyVault/vaults/pytest-shared-vault?api-version=2016-10-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/azkv-pytest/providers/Microsoft.KeyVault/vaults/pytest-shared-vault?api-version=2018-02-14-preview
   response:
     body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/azkv-pytest/providers/Microsoft.KeyVault/vaults/pytest-shared-vault","name":"pytest-shared-vault","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"premium"},"tenantId":"00000000-0000-0000-0000-000000000000","accessPolicies":[{"tenantId":"00000000-0000-0000-0000-000000000000","objectId":"00000000-0000-0000-0000-000000000000","permissions":{"certificates":["get","list","delete","create","import","update","managecontacts","getissuers","listissuers","setissuers","deleteissuers","manageissuers","recover","purge"],"keys":["encrypt","decrypt","wrapKey","unwrapKey","sign","verify","get","list","create","update","import","delete","backup","restore","recover","purge"],"secrets":["get","list","set","delete","backup","restore","recover","purge"],"storage":["get","list","delete","set","update","regeneratekey","setsas","listsas","getsas","deletesas"]}}],"enabledForDeployment":true,"enabledForDiskEncryption":true,"enabledForTemplateDeployment":true,"vaultUri":"https://pytest-shared-vault.vault.azure.net/"}}'}
     headers:

azure-mgmt/tests/recordings/test_key_vault_data.test_certificate_recover_and_purge.yaml

@@ -23,7 +23,7 @@ interactions:
       accept-language: [en-US]
       x-ms-client-request-id: [e1a37838-4afa-11e7-9197-5065f34efe31]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_key_vault_data_test_certificate_recover_and_purge626b1626/providers/Microsoft.KeyVault/vaults/vault-626b1626?api-version=2016-10-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_key_vault_data_test_certificate_recover_and_purge626b1626/providers/Microsoft.KeyVault/vaults/vault-626b1626?api-version=2018-02-14-preview
   response:
     body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_key_vault_data_test_certificate_recover_and_purge626b1626/providers/Microsoft.KeyVault/vaults/vault-626b1626","name":"vault-626b1626","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"premium"},"tenantId":"00000000-0000-0000-0000-000000000000","accessPolicies":[{"tenantId":"00000000-0000-0000-0000-000000000000","objectId":"00000000-0000-0000-0000-000000000000","permissions":{"storage":["get","list","delete","set","update","regeneratekey","setsas","listsas","getsas","deletesas"],"secrets":["get","list","set","delete","backup","restore","recover","purge"],"keys":["encrypt","decrypt","wrapKey","unwrapKey","sign","verify","get","list","create","update","import","delete","backup","restore","recover","purge"],"certificates":["get","list","delete","create","import","update","managecontacts","getissuers","listissuers","setissuers","deleteissuers","manageissuers","recover","purge"]}}],"enabledForDeployment":true,"enabledForDiskEncryption":true,"enabledForTemplateDeployment":true,"enableSoftDelete":true,"vaultUri":"https://vault-626b1626.vault.azure.net"}}'}
     headers:
@@ -571,7 +571,7 @@ interactions:
       accept-language: [en-US]
       x-ms-client-request-id: [17de96f4-4afb-11e7-a572-5065f34efe31]
     method: DELETE
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_key_vault_data_test_certificate_recover_and_purge626b1626/providers/Microsoft.KeyVault/vaults/vault-626b1626?api-version=2016-10-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_key_vault_data_test_certificate_recover_and_purge626b1626/providers/Microsoft.KeyVault/vaults/vault-626b1626?api-version=2018-02-14-preview
   response:
     body: {string: ''}
     headers:
@@ -604,15 +604,15 @@ interactions:
       accept-language: [en-US]
       x-ms-client-request-id: [1e75b378-4afb-11e7-8aec-5065f34efe31]
     method: POST
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.KeyVault/locations/westus/deletedVaults/vault-626b1626/purge?api-version=2016-10-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.KeyVault/locations/westus/deletedVaults/vault-626b1626/purge?api-version=2018-02-14-preview
   response:
     body: {string: ''}
     headers:
       Cache-Control: [no-cache]
       Content-Length: ['0']
       Date: ['Tue, 06 Jun 2017 21:00:06 GMT']
       Expires: ['-1']
-      Location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.KeyVault/locations/westus/operationResults/VVR8MDYzNjMyMzc5NjA3NTQwNDczMXw3MUI4NDEwM0IxNDU0QTNDOUFGMDdDRUQ2OEIyNkU4RQ?api-version=2016-10-01']
+      Location: ['https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/providers/Microsoft.KeyVault/locations/westus/operationResults/VVR8MDYzNjMyMzc5NjA3NTQwNDczMXw3MUI4NDEwM0IxNDU0QTNDOUFGMDdDRUQ2OEIyNkU4RQ?api-version=2018-02-14-preview']
       Pragma: [no-cache]
       Retry-After: ['0']
       Server: [Microsoft-IIS/8.5]

azure-mgmt/tests/recordings/test_key_vault_data.test_iterate_empty_list_commands.yaml

@@ -22,7 +22,7 @@ interactions:
       accept-language: [en-US]
       x-ms-client-request-id: [80bee00c-4bac-11e7-b321-5065f34efe31]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_key_vault_data_test_iterate_empty_list_commands397e1582/providers/Microsoft.KeyVault/vaults/vault-397e1582?api-version=2016-10-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_key_vault_data_test_iterate_empty_list_commands397e1582/providers/Microsoft.KeyVault/vaults/vault-397e1582?api-version=2018-02-14-preview
   response:
     body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_key_vault_data_test_iterate_empty_list_commands397e1582/providers/Microsoft.KeyVault/vaults/vault-397e1582","name":"vault-397e1582","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"premium"},"tenantId":"00000000-0000-0000-0000-000000000000","accessPolicies":[{"tenantId":"00000000-0000-0000-0000-000000000000","objectId":"00000000-0000-0000-0000-000000000000","permissions":{"certificates":["get","list","delete","create","import","update","managecontacts","getissuers","listissuers","setissuers","deleteissuers","manageissuers","recover","purge"],"secrets":["get","list","set","delete","backup","restore","recover","purge"],"keys":["encrypt","decrypt","wrapKey","unwrapKey","sign","verify","get","list","create","update","import","delete","backup","restore","recover","purge"],"storage":["get","list","delete","set","update","regeneratekey","setsas","listsas","getsas","deletesas"]}}],"enabledForDeployment":true,"enabledForDiskEncryption":true,"enabledForTemplateDeployment":true,"vaultUri":"https://vault-397e1582.vault.azure.net"}}'}
     headers:
@@ -69,7 +69,7 @@ interactions:
       accept-language: [en-US]
       x-ms-client-request-id: [d2914170-4bac-11e7-92a0-5065f34efe31]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_key_vault_data_test_iterate_empty_list_commands397e1582/providers/Microsoft.KeyVault/vaults/vault-397e1582?api-version=2016-10-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_key_vault_data_test_iterate_empty_list_commands397e1582/providers/Microsoft.KeyVault/vaults/vault-397e1582?api-version=2018-02-14-preview
   response:
     body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_key_vault_data_test_iterate_empty_list_commands397e1582/providers/Microsoft.KeyVault/vaults/vault-397e1582","name":"vault-397e1582","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"premium"},"tenantId":"00000000-0000-0000-0000-000000000000","accessPolicies":[{"tenantId":"00000000-0000-0000-0000-000000000000","objectId":"00000000-0000-0000-0000-000000000000","permissions":{"secrets":["get","list","set","delete","backup","restore","recover","purge"],"certificates":["get","list","delete","create","import","update","managecontacts","getissuers","listissuers","setissuers","deleteissuers","manageissuers","recover","purge"],"keys":["encrypt","decrypt","wrapKey","unwrapKey","sign","verify","get","list","create","update","import","delete","backup","restore","recover","purge"],"storage":["get","list","delete","set","update","regeneratekey","setsas","listsas","getsas","deletesas"]}}],"enabledForDeployment":true,"enabledForDiskEncryption":true,"enabledForTemplateDeployment":true,"vaultUri":"https://vault-397e1582.vault.azure.net"}}'}
     headers:
@@ -147,7 +147,7 @@ interactions:
       accept-language: [en-US]
       x-ms-client-request-id: [4be14828-4bad-11e7-96ea-5065f34efe31]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_key_vault_data_test_iterate_empty_list_commands397e1582/providers/Microsoft.KeyVault/vaults/vault-397e1582?api-version=2016-10-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_key_vault_data_test_iterate_empty_list_commands397e1582/providers/Microsoft.KeyVault/vaults/vault-397e1582?api-version=2018-02-14-preview
   response:
     body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_key_vault_data_test_iterate_empty_list_commands397e1582/providers/Microsoft.KeyVault/vaults/vault-397e1582","name":"vault-397e1582","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"premium"},"tenantId":"00000000-0000-0000-0000-000000000000","accessPolicies":[{"tenantId":"00000000-0000-0000-0000-000000000000","objectId":"00000000-0000-0000-0000-000000000000","permissions":{"storage":["get","list","delete","set","update","regeneratekey","setsas","listsas","getsas","deletesas"],"keys":["encrypt","decrypt","wrapKey","unwrapKey","sign","verify","get","list","create","update","import","delete","backup","restore","recover","purge"],"secrets":["get","list","set","delete","backup","restore","recover","purge"],"certificates":["get","list","delete","create","import","update","managecontacts","getissuers","listissuers","setissuers","deleteissuers","manageissuers","recover","purge"]}}],"enabledForDeployment":true,"enabledForDiskEncryption":true,"enabledForTemplateDeployment":true,"vaultUri":"https://vault-397e1582.vault.azure.net"}}'}
     headers:
@@ -224,7 +224,7 @@ interactions:
       accept-language: [en-US]
       x-ms-client-request-id: [b67af490-4bb0-11e7-a7fb-5065f34efe31]
     method: PUT
-    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_key_vault_data_test_iterate_empty_list_commands397e1582/providers/Microsoft.KeyVault/vaults/vault-397e1582?api-version=2016-10-01
+    uri: https://management.azure.com/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_key_vault_data_test_iterate_empty_list_commands397e1582/providers/Microsoft.KeyVault/vaults/vault-397e1582?api-version=2018-02-14-preview
   response:
     body: {string: '{"id":"/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/test_key_vault_data_test_iterate_empty_list_commands397e1582/providers/Microsoft.KeyVault/vaults/vault-397e1582","name":"vault-397e1582","type":"Microsoft.KeyVault/vaults","location":"westus","tags":{},"properties":{"sku":{"family":"A","name":"premium"},"tenantId":"00000000-0000-0000-0000-000000000000","accessPolicies":[{"tenantId":"00000000-0000-0000-0000-000000000000","objectId":"00000000-0000-0000-0000-000000000000","permissions":{"secrets":["get","list","set","delete","backup","restore","recover","purge"],"keys":["encrypt","decrypt","wrapKey","unwrapKey","sign","verify","get","list","create","update","import","delete","backup","restore","recover","purge"],"certificates":["get","list","delete","create","import","update","managecontacts","getissuers","listissuers","setissuers","deleteissuers","manageissuers","recover","purge"],"storage":["get","list","delete","set","update","regeneratekey","setsas","listsas","getsas","deletesas"]}}],"enabledForDeployment":true,"enabledForDiskEncryption":true,"enabledForTemplateDeployment":true,"vaultUri":"https://vault-397e1582.vault.azure.net"}}'}
     headers: