[AutoPR keyvault/data-plane] EC curve and algorithm name updates

azure-keyvault/azure/keyvault/models/__init__.py

@@ -9,82 +9,164 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .attributes import Attributes
-from .json_web_key import JsonWebKey
-from .key_attributes import KeyAttributes
-from .key_bundle import KeyBundle
-from .key_item import KeyItem
-from .deleted_key_bundle import DeletedKeyBundle
-from .deleted_key_item import DeletedKeyItem
-from .secret_attributes import SecretAttributes
-from .secret_bundle import SecretBundle
-from .secret_item import SecretItem
-from .deleted_secret_bundle import DeletedSecretBundle
-from .deleted_secret_item import DeletedSecretItem
-from .secret_restore_parameters import SecretRestoreParameters
-from .storage_restore_parameters import StorageRestoreParameters
-from .certificate_attributes import CertificateAttributes
-from .certificate_item import CertificateItem
-from .certificate_issuer_item import CertificateIssuerItem
-from .key_properties import KeyProperties
-from .secret_properties import SecretProperties
-from .subject_alternative_names import SubjectAlternativeNames
-from .x509_certificate_properties import X509CertificateProperties
-from .trigger import Trigger
-from .action import Action
-from .lifetime_action import LifetimeAction
-from .issuer_parameters import IssuerParameters
-from .certificate_policy import CertificatePolicy
-from .certificate_bundle import CertificateBundle
-from .deleted_certificate_bundle import DeletedCertificateBundle
-from .deleted_certificate_item import DeletedCertificateItem
-from .error import Error
-from .certificate_operation import CertificateOperation
-from .issuer_credentials import IssuerCredentials
-from .administrator_details import AdministratorDetails
-from .organization_details import OrganizationDetails
-from .issuer_attributes import IssuerAttributes
-from .issuer_bundle import IssuerBundle
-from .contact import Contact
-from .contacts import Contacts
-from .key_create_parameters import KeyCreateParameters
-from .key_import_parameters import KeyImportParameters
-from .key_operations_parameters import KeyOperationsParameters
-from .key_sign_parameters import KeySignParameters
-from .key_verify_parameters import KeyVerifyParameters
-from .key_update_parameters import KeyUpdateParameters
-from .key_restore_parameters import KeyRestoreParameters
-from .secret_set_parameters import SecretSetParameters
-from .secret_update_parameters import SecretUpdateParameters
-from .certificate_create_parameters import CertificateCreateParameters
-from .certificate_import_parameters import CertificateImportParameters
-from .certificate_update_parameters import CertificateUpdateParameters
-from .certificate_merge_parameters import CertificateMergeParameters
-from .certificate_issuer_set_parameters import CertificateIssuerSetParameters
-from .certificate_issuer_update_parameters import CertificateIssuerUpdateParameters
-from .certificate_operation_update_parameter import CertificateOperationUpdateParameter
-from .key_operation_result import KeyOperationResult
-from .key_verify_result import KeyVerifyResult
-from .backup_key_result import BackupKeyResult
-from .backup_secret_result import BackupSecretResult
-from .backup_storage_result import BackupStorageResult
-from .pending_certificate_signing_request_result import PendingCertificateSigningRequestResult
-from .storage_account_attributes import StorageAccountAttributes
-from .storage_bundle import StorageBundle
-from .deleted_storage_bundle import DeletedStorageBundle
-from .storage_account_create_parameters import StorageAccountCreateParameters
-from .storage_account_update_parameters import StorageAccountUpdateParameters
-from .storage_account_regenerte_key_parameters import StorageAccountRegenerteKeyParameters
-from .storage_account_item import StorageAccountItem
-from .deleted_storage_account_item import DeletedStorageAccountItem
-from .sas_definition_attributes import SasDefinitionAttributes
-from .sas_definition_bundle import SasDefinitionBundle
-from .deleted_sas_definition_bundle import DeletedSasDefinitionBundle
-from .sas_definition_item import SasDefinitionItem
-from .deleted_sas_definition_item import DeletedSasDefinitionItem
-from .sas_definition_create_parameters import SasDefinitionCreateParameters
-from .sas_definition_update_parameters import SasDefinitionUpdateParameters
-from .key_vault_error import KeyVaultError, KeyVaultErrorException
+try:
+    from .attributes_py3 import Attributes
+    from .json_web_key_py3 import JsonWebKey
+    from .key_attributes_py3 import KeyAttributes
+    from .key_bundle_py3 import KeyBundle
+    from .key_item_py3 import KeyItem
+    from .deleted_key_bundle_py3 import DeletedKeyBundle
+    from .deleted_key_item_py3 import DeletedKeyItem
+    from .secret_attributes_py3 import SecretAttributes
+    from .secret_bundle_py3 import SecretBundle
+    from .secret_item_py3 import SecretItem
+    from .deleted_secret_bundle_py3 import DeletedSecretBundle
+    from .deleted_secret_item_py3 import DeletedSecretItem
+    from .secret_restore_parameters_py3 import SecretRestoreParameters
+    from .storage_restore_parameters_py3 import StorageRestoreParameters
+    from .certificate_attributes_py3 import CertificateAttributes
+    from .certificate_item_py3 import CertificateItem
+    from .certificate_issuer_item_py3 import CertificateIssuerItem
+    from .key_properties_py3 import KeyProperties
+    from .secret_properties_py3 import SecretProperties
+    from .subject_alternative_names_py3 import SubjectAlternativeNames
+    from .x509_certificate_properties_py3 import X509CertificateProperties
+    from .trigger_py3 import Trigger
+    from .action_py3 import Action
+    from .lifetime_action_py3 import LifetimeAction
+    from .issuer_parameters_py3 import IssuerParameters
+    from .certificate_policy_py3 import CertificatePolicy
+    from .certificate_bundle_py3 import CertificateBundle
+    from .deleted_certificate_bundle_py3 import DeletedCertificateBundle
+    from .deleted_certificate_item_py3 import DeletedCertificateItem
+    from .error_py3 import Error
+    from .certificate_operation_py3 import CertificateOperation
+    from .issuer_credentials_py3 import IssuerCredentials
+    from .administrator_details_py3 import AdministratorDetails
+    from .organization_details_py3 import OrganizationDetails
+    from .issuer_attributes_py3 import IssuerAttributes
+    from .issuer_bundle_py3 import IssuerBundle
+    from .contact_py3 import Contact
+    from .contacts_py3 import Contacts
+    from .key_create_parameters_py3 import KeyCreateParameters
+    from .key_import_parameters_py3 import KeyImportParameters
+    from .key_operations_parameters_py3 import KeyOperationsParameters
+    from .key_sign_parameters_py3 import KeySignParameters
+    from .key_verify_parameters_py3 import KeyVerifyParameters
+    from .key_update_parameters_py3 import KeyUpdateParameters
+    from .key_restore_parameters_py3 import KeyRestoreParameters
+    from .secret_set_parameters_py3 import SecretSetParameters
+    from .secret_update_parameters_py3 import SecretUpdateParameters
+    from .certificate_create_parameters_py3 import CertificateCreateParameters
+    from .certificate_import_parameters_py3 import CertificateImportParameters
+    from .certificate_update_parameters_py3 import CertificateUpdateParameters
+    from .certificate_merge_parameters_py3 import CertificateMergeParameters
+    from .certificate_issuer_set_parameters_py3 import CertificateIssuerSetParameters
+    from .certificate_issuer_update_parameters_py3 import CertificateIssuerUpdateParameters
+    from .certificate_operation_update_parameter_py3 import CertificateOperationUpdateParameter
+    from .key_operation_result_py3 import KeyOperationResult
+    from .key_verify_result_py3 import KeyVerifyResult
+    from .backup_key_result_py3 import BackupKeyResult
+    from .backup_secret_result_py3 import BackupSecretResult
+    from .backup_storage_result_py3 import BackupStorageResult
+    from .pending_certificate_signing_request_result_py3 import PendingCertificateSigningRequestResult
+    from .storage_account_attributes_py3 import StorageAccountAttributes
+    from .storage_bundle_py3 import StorageBundle
+    from .deleted_storage_bundle_py3 import DeletedStorageBundle
+    from .storage_account_create_parameters_py3 import StorageAccountCreateParameters
+    from .storage_account_update_parameters_py3 import StorageAccountUpdateParameters
+    from .storage_account_regenerte_key_parameters_py3 import StorageAccountRegenerteKeyParameters
+    from .storage_account_item_py3 import StorageAccountItem
+    from .deleted_storage_account_item_py3 import DeletedStorageAccountItem
+    from .sas_definition_attributes_py3 import SasDefinitionAttributes
+    from .sas_definition_bundle_py3 import SasDefinitionBundle
+    from .deleted_sas_definition_bundle_py3 import DeletedSasDefinitionBundle
+    from .sas_definition_item_py3 import SasDefinitionItem
+    from .deleted_sas_definition_item_py3 import DeletedSasDefinitionItem
+    from .sas_definition_create_parameters_py3 import SasDefinitionCreateParameters
+    from .sas_definition_update_parameters_py3 import SasDefinitionUpdateParameters
+    from .key_vault_error_py3 import KeyVaultError, KeyVaultErrorException
+    from .certificate_restore_parameters_py3 import CertificateRestoreParameters
+    from .backup_certificate_result_py3 import BackupCertificateResult
+except (SyntaxError, ImportError):
+    from .attributes import Attributes
+    from .json_web_key import JsonWebKey
+    from .key_attributes import KeyAttributes
+    from .key_bundle import KeyBundle
+    from .key_item import KeyItem
+    from .deleted_key_bundle import DeletedKeyBundle
+    from .deleted_key_item import DeletedKeyItem
+    from .secret_attributes import SecretAttributes
+    from .secret_bundle import SecretBundle
+    from .secret_item import SecretItem
+    from .deleted_secret_bundle import DeletedSecretBundle
+    from .deleted_secret_item import DeletedSecretItem
+    from .secret_restore_parameters import SecretRestoreParameters
+    from .storage_restore_parameters import StorageRestoreParameters
+    from .certificate_attributes import CertificateAttributes
+    from .certificate_item import CertificateItem
+    from .certificate_issuer_item import CertificateIssuerItem
+    from .key_properties import KeyProperties
+    from .secret_properties import SecretProperties
+    from .subject_alternative_names import SubjectAlternativeNames
+    from .x509_certificate_properties import X509CertificateProperties
+    from .trigger import Trigger
+    from .action import Action
+    from .lifetime_action import LifetimeAction
+    from .issuer_parameters import IssuerParameters
+    from .certificate_policy import CertificatePolicy
+    from .certificate_bundle import CertificateBundle
+    from .deleted_certificate_bundle import DeletedCertificateBundle
+    from .deleted_certificate_item import DeletedCertificateItem
+    from .error import Error
+    from .certificate_operation import CertificateOperation
+    from .issuer_credentials import IssuerCredentials
+    from .administrator_details import AdministratorDetails
+    from .organization_details import OrganizationDetails
+    from .issuer_attributes import IssuerAttributes
+    from .issuer_bundle import IssuerBundle
+    from .contact import Contact
+    from .contacts import Contacts
+    from .key_create_parameters import KeyCreateParameters
+    from .key_import_parameters import KeyImportParameters
+    from .key_operations_parameters import KeyOperationsParameters
+    from .key_sign_parameters import KeySignParameters
+    from .key_verify_parameters import KeyVerifyParameters
+    from .key_update_parameters import KeyUpdateParameters
+    from .key_restore_parameters import KeyRestoreParameters
+    from .secret_set_parameters import SecretSetParameters
+    from .secret_update_parameters import SecretUpdateParameters
+    from .certificate_create_parameters import CertificateCreateParameters
+    from .certificate_import_parameters import CertificateImportParameters
+    from .certificate_update_parameters import CertificateUpdateParameters
+    from .certificate_merge_parameters import CertificateMergeParameters
+    from .certificate_issuer_set_parameters import CertificateIssuerSetParameters
+    from .certificate_issuer_update_parameters import CertificateIssuerUpdateParameters
+    from .certificate_operation_update_parameter import CertificateOperationUpdateParameter
+    from .key_operation_result import KeyOperationResult
+    from .key_verify_result import KeyVerifyResult
+    from .backup_key_result import BackupKeyResult
+    from .backup_secret_result import BackupSecretResult
+    from .backup_storage_result import BackupStorageResult
+    from .pending_certificate_signing_request_result import PendingCertificateSigningRequestResult
+    from .storage_account_attributes import StorageAccountAttributes
+    from .storage_bundle import StorageBundle
+    from .deleted_storage_bundle import DeletedStorageBundle
+    from .storage_account_create_parameters import StorageAccountCreateParameters
+    from .storage_account_update_parameters import StorageAccountUpdateParameters
+    from .storage_account_regenerte_key_parameters import StorageAccountRegenerteKeyParameters
+    from .storage_account_item import StorageAccountItem
+    from .deleted_storage_account_item import DeletedStorageAccountItem
+    from .sas_definition_attributes import SasDefinitionAttributes
+    from .sas_definition_bundle import SasDefinitionBundle
+    from .deleted_sas_definition_bundle import DeletedSasDefinitionBundle
+    from .sas_definition_item import SasDefinitionItem
+    from .deleted_sas_definition_item import DeletedSasDefinitionItem
+    from .sas_definition_create_parameters import SasDefinitionCreateParameters
+    from .sas_definition_update_parameters import SasDefinitionUpdateParameters
+    from .key_vault_error import KeyVaultError, KeyVaultErrorException
+    from .certificate_restore_parameters import CertificateRestoreParameters
+    from .backup_certificate_result import BackupCertificateResult
 from .key_item_paged import KeyItemPaged
 from .deleted_key_item_paged import DeletedKeyItemPaged
 from .secret_item_paged import SecretItemPaged
@@ -185,6 +267,8 @@
     'SasDefinitionCreateParameters',
     'SasDefinitionUpdateParameters',
     'KeyVaultError', 'KeyVaultErrorException',
+    'CertificateRestoreParameters',
+    'BackupCertificateResult',
     'KeyItemPaged',
     'DeletedKeyItemPaged',
     'SecretItemPaged',

azure-keyvault/azure/keyvault/models/action.py

@@ -24,6 +24,6 @@ class Action(Model):
         'action_type': {'key': 'action_type', 'type': 'ActionType'},
     }
 
-    def __init__(self, action_type=None):
-        super(Action, self).__init__()
-        self.action_type = action_type
+    def __init__(self, **kwargs):
+        super(Action, self).__init__(**kwargs)
+        self.action_type = kwargs.get('action_type', None)

azure-keyvault/azure/keyvault/models/action_py3.py

@@ -0,0 +1,29 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class Action(Model):
+    """The action that will be executed.
+
+    :param action_type: The type of the action. Possible values include:
+     'EmailContacts', 'AutoRenew'
+    :type action_type: str or ~azure.keyvault.models.ActionType
+    """
+
+    _attribute_map = {
+        'action_type': {'key': 'action_type', 'type': 'ActionType'},
+    }
+
+    def __init__(self, *, action_type=None, **kwargs) -> None:
+        super(Action, self).__init__(**kwargs)
+        self.action_type = action_type

azure-keyvault/azure/keyvault/models/administrator_details.py

@@ -32,9 +32,9 @@ class AdministratorDetails(Model):
         'phone': {'key': 'phone', 'type': 'str'},
     }
 
-    def __init__(self, first_name=None, last_name=None, email_address=None, phone=None):
-        super(AdministratorDetails, self).__init__()
-        self.first_name = first_name
-        self.last_name = last_name
-        self.email_address = email_address
-        self.phone = phone
+    def __init__(self, **kwargs):
+        super(AdministratorDetails, self).__init__(**kwargs)
+        self.first_name = kwargs.get('first_name', None)
+        self.last_name = kwargs.get('last_name', None)
+        self.email_address = kwargs.get('email_address', None)
+        self.phone = kwargs.get('phone', None)

azure-keyvault/azure/keyvault/models/administrator_details_py3.py

@@ -0,0 +1,40 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+#
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class AdministratorDetails(Model):
+    """Details of the organization administrator of the certificate issuer.
+
+    :param first_name: First name.
+    :type first_name: str
+    :param last_name: Last name.
+    :type last_name: str
+    :param email_address: Email addresss.
+    :type email_address: str
+    :param phone: Phone number.
+    :type phone: str
+    """
+
+    _attribute_map = {
+        'first_name': {'key': 'first_name', 'type': 'str'},
+        'last_name': {'key': 'last_name', 'type': 'str'},
+        'email_address': {'key': 'email', 'type': 'str'},
+        'phone': {'key': 'phone', 'type': 'str'},
+    }
+
+    def __init__(self, *, first_name: str=None, last_name: str=None, email_address: str=None, phone: str=None, **kwargs) -> None:
+        super(AdministratorDetails, self).__init__(**kwargs)
+        self.first_name = first_name
+        self.last_name = last_name
+        self.email_address = email_address
+        self.phone = phone

azure-keyvault/azure/keyvault/models/attributes.py

@@ -43,10 +43,10 @@ class Attributes(Model):
         'updated': {'key': 'updated', 'type': 'unix-time'},
     }
 
-    def __init__(self, enabled=None, not_before=None, expires=None):
-        super(Attributes, self).__init__()
-        self.enabled = enabled
-        self.not_before = not_before
-        self.expires = expires
+    def __init__(self, **kwargs):
+        super(Attributes, self).__init__(**kwargs)
+        self.enabled = kwargs.get('enabled', None)
+        self.not_before = kwargs.get('not_before', None)
+        self.expires = kwargs.get('expires', None)
         self.created = None
         self.updated = None