Skip to content

Commit

Permalink
Generated from 729ba89e8cb0127e984cb88e95a9d455591cd2eb
Browse files Browse the repository at this point in the history 
Revert discriminator changes introduced by #8606
  • Loading branch information
SDK Automation committed Aug 17, 2020
1 parent 5d277ae commit 0d69fe4
Show file tree
Hide file tree
Showing 7 changed files with 277 additions and 93 deletions.
5 changes: 5 additions & 0 deletions ...orage/azure-mgmt-storagecache/azure/mgmt/storagecache/_storage_cache_management_client.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from .operations import Operations
from .operations import SkusOperations
from .operations import UsageModelsOperations
from .operations import AscOperations
from .operations import CachesOperations
from .operations import StorageTargetsOperations
from . import models
Expand All @@ -33,6 +34,8 @@ class StorageCacheManagementClient(SDKClient):
:vartype skus: azure.mgmt.storagecache.operations.SkusOperations
:ivar usage_models: UsageModels operations
:vartype usage_models: azure.mgmt.storagecache.operations.UsageModelsOperations
:ivar asc_operations: AscOperations operations
:vartype asc_operations: azure.mgmt.storagecache.operations.AscOperations
:ivar caches: Caches operations
:vartype caches: azure.mgmt.storagecache.operations.CachesOperations
:ivar storage_targets: StorageTargets operations
Expand Down Expand Up @@ -65,6 +68,8 @@ def __init__(
self._client, self.config, self._serialize, self._deserialize)
self.usage_models = UsageModelsOperations(
self._client, self.config, self._serialize, self._deserialize)
self.asc_operations = AscOperations(
self._client, self.config, self._serialize, self._deserialize)
self.caches = CachesOperations(
self._client, self.config, self._serialize, self._deserialize)
self.storage_targets = StorageTargetsOperations(
Expand Down
8 changes: 6 additions & 2 deletions sdk/storage/azure-mgmt-storagecache/azure/mgmt/storagecache/models/__init__.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
try:
from ._models_py3 import ApiOperation
from ._models_py3 import ApiOperationDisplay
from ._models_py3 import AscOperation
from ._models_py3 import Cache
from ._models_py3 import CacheEncryptionSettings
from ._models_py3 import CacheHealth
Expand All @@ -23,6 +24,7 @@
from ._models_py3 import ClfsTarget
from ._models_py3 import ClfsTargetProperties
from ._models_py3 import CloudErrorBody
from ._models_py3 import ErrorResponse
from ._models_py3 import KeyVaultKeyReference
from ._models_py3 import KeyVaultKeyReferenceSourceVault
from ._models_py3 import NamespaceJunction
Expand All @@ -42,6 +44,7 @@
except (SyntaxError, ImportError):
from ._models import ApiOperation
from ._models import ApiOperationDisplay
from ._models import AscOperation
from ._models import Cache
from ._models import CacheEncryptionSettings
from ._models import CacheHealth
Expand All @@ -53,6 +56,7 @@
from ._models import ClfsTarget
from ._models import ClfsTargetProperties
from ._models import CloudErrorBody
from ._models import ErrorResponse
from ._models import KeyVaultKeyReference
from ._models import KeyVaultKeyReferenceSourceVault
from ._models import NamespaceJunction
Expand All @@ -79,13 +83,13 @@
HealthStateType,
ProvisioningStateType,
FirmwareStatusType,
StorageTargetType,
ReasonCode,
)

__all__ = [
'ApiOperation',
'ApiOperationDisplay',
'AscOperation',
'Cache',
'CacheEncryptionSettings',
'CacheHealth',
Expand All @@ -97,6 +101,7 @@
'ClfsTarget',
'ClfsTargetProperties',
'CloudErrorBody',
'ErrorResponse',
'KeyVaultKeyReference',
'KeyVaultKeyReferenceSourceVault',
'NamespaceJunction',
Expand All @@ -122,6 +127,5 @@
'HealthStateType',
'ProvisioningStateType',
'FirmwareStatusType',
'StorageTargetType',
'ReasonCode',
]
115 changes: 77 additions & 38 deletions sdk/storage/azure-mgmt-storagecache/azure/mgmt/storagecache/models/_models.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,42 @@ def __init__(self, **kwargs):
self.resource = kwargs.get('resource', None)


class AscOperation(Model):
"""The status of operation.
:param id: The operation Id.
:type id: str
:param name: The operation name.
:type name: str
:param start_time: The start time of the operation.
:type start_time: str
:param end_time: The end time of the operation.
:type end_time: str
:param status: The status of the operation.
:type status: str
:param error: The error detail of the operation if any.
:type error: ~azure.mgmt.storagecache.models.ErrorResponse
"""

_attribute_map = {
'id': {'key': 'id', 'type': 'str'},
'name': {'key': 'name', 'type': 'str'},
'start_time': {'key': 'startTime', 'type': 'str'},
'end_time': {'key': 'endTime', 'type': 'str'},
'status': {'key': 'status', 'type': 'str'},
'error': {'key': 'error', 'type': 'ErrorResponse'},
}

def __init__(self, **kwargs):
super(AscOperation, self).__init__(**kwargs)
self.id = kwargs.get('id', None)
self.name = kwargs.get('name', None)
self.start_time = kwargs.get('start_time', None)
self.end_time = kwargs.get('end_time', None)
self.status = kwargs.get('status', None)
self.error = kwargs.get('error', None)


class Cache(Model):
"""A Cache instance. Follows Azure Resource Manager standards:
https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/resource-api-reference.md.
Expand Down Expand Up @@ -368,8 +404,6 @@ class StorageTargetProperties(Model):
:param junctions: List of Cache namespace junctions to target for
namespace associations.
:type junctions: list[~azure.mgmt.storagecache.models.NamespaceJunction]
:param target_type: Type of the Storage Target.
:type target_type: str
:param provisioning_state: ARM provisioning state, see
https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/Addendum.md#provisioningstate-property.
Possible values include: 'Succeeded', 'Failed', 'Cancelled', 'Creating',
Expand All @@ -382,37 +416,35 @@ class StorageTargetProperties(Model):
:type clfs: ~azure.mgmt.storagecache.models.ClfsTarget
:param unknown: Properties when targetType is unknown.
:type unknown: ~azure.mgmt.storagecache.models.UnknownTarget
:param target_base_type: Required. Constant filled by server.
:type target_base_type: str
:param target_type: Required. Constant filled by server.
:type target_type: str
"""

_validation = {
'target_base_type': {'required': True},
'target_type': {'required': True},
}

_attribute_map = {
'junctions': {'key': 'junctions', 'type': '[NamespaceJunction]'},
'target_type': {'key': 'targetType', 'type': 'str'},
'provisioning_state': {'key': 'provisioningState', 'type': 'str'},
'nfs3': {'key': 'nfs3', 'type': 'Nfs3Target'},
'clfs': {'key': 'clfs', 'type': 'ClfsTarget'},
'unknown': {'key': 'unknown', 'type': 'UnknownTarget'},
'target_base_type': {'key': 'targetBaseType', 'type': 'str'},
'target_type': {'key': 'targetType', 'type': 'str'},
}

_subtype_map = {
'target_base_type': {'nfs3': 'Nfs3TargetProperties', 'clfs': 'ClfsTargetProperties', 'unknown': 'UnknownTargetProperties'}
'target_type': {'nfs3': 'Nfs3TargetProperties', 'clfs': 'ClfsTargetProperties', 'unknown': 'UnknownTargetProperties'}
}

def __init__(self, **kwargs):
super(StorageTargetProperties, self).__init__(**kwargs)
self.junctions = kwargs.get('junctions', None)
self.target_type = kwargs.get('target_type', None)
self.provisioning_state = kwargs.get('provisioning_state', None)
self.nfs3 = kwargs.get('nfs3', None)
self.clfs = kwargs.get('clfs', None)
self.unknown = kwargs.get('unknown', None)
self.target_base_type = None
self.target_type = None


class ClfsTargetProperties(StorageTargetProperties):
Expand All @@ -423,8 +455,6 @@ class ClfsTargetProperties(StorageTargetProperties):
:param junctions: List of Cache namespace junctions to target for
namespace associations.
:type junctions: list[~azure.mgmt.storagecache.models.NamespaceJunction]
:param target_type: Type of the Storage Target.
:type target_type: str
:param provisioning_state: ARM provisioning state, see
https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/Addendum.md#provisioningstate-property.
Possible values include: 'Succeeded', 'Failed', 'Cancelled', 'Creating',
Expand All @@ -437,27 +467,26 @@ class ClfsTargetProperties(StorageTargetProperties):
:type clfs: ~azure.mgmt.storagecache.models.ClfsTarget
:param unknown: Properties when targetType is unknown.
:type unknown: ~azure.mgmt.storagecache.models.UnknownTarget
:param target_base_type: Required. Constant filled by server.
:type target_base_type: str
:param target_type: Required. Constant filled by server.
:type target_type: str
"""

_validation = {
'target_base_type': {'required': True},
'target_type': {'required': True},
}

_attribute_map = {
'junctions': {'key': 'junctions', 'type': '[NamespaceJunction]'},
'target_type': {'key': 'targetType', 'type': 'str'},
'provisioning_state': {'key': 'provisioningState', 'type': 'str'},
'nfs3': {'key': 'nfs3', 'type': 'Nfs3Target'},
'clfs': {'key': 'clfs', 'type': 'ClfsTarget'},
'unknown': {'key': 'unknown', 'type': 'UnknownTarget'},
'target_base_type': {'key': 'targetBaseType', 'type': 'str'},
'target_type': {'key': 'targetType', 'type': 'str'},
}

def __init__(self, **kwargs):
super(ClfsTargetProperties, self).__init__(**kwargs)
self.target_base_type = 'clfs'
self.target_type = 'clfs'


class CloudError(Model):
Expand Down Expand Up @@ -519,6 +548,26 @@ def __init__(self, **kwargs):
self.target = kwargs.get('target', None)


class ErrorResponse(Model):
"""Describes the format of Error response.
:param code: Error code
:type code: str
:param message: Error message indicating why the operation failed.
:type message: str
"""

_attribute_map = {
'code': {'key': 'code', 'type': 'str'},
'message': {'key': 'message', 'type': 'str'},
}

def __init__(self, **kwargs):
super(ErrorResponse, self).__init__(**kwargs)
self.code = kwargs.get('code', None)
self.message = kwargs.get('message', None)


class KeyVaultKeyReference(Model):
"""Describes a reference to Key Vault Key.
Expand Down Expand Up @@ -623,8 +672,6 @@ class Nfs3TargetProperties(StorageTargetProperties):
:param junctions: List of Cache namespace junctions to target for
namespace associations.
:type junctions: list[~azure.mgmt.storagecache.models.NamespaceJunction]
:param target_type: Type of the Storage Target.
:type target_type: str
:param provisioning_state: ARM provisioning state, see
https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/Addendum.md#provisioningstate-property.
Possible values include: 'Succeeded', 'Failed', 'Cancelled', 'Creating',
Expand All @@ -637,27 +684,26 @@ class Nfs3TargetProperties(StorageTargetProperties):
:type clfs: ~azure.mgmt.storagecache.models.ClfsTarget
:param unknown: Properties when targetType is unknown.
:type unknown: ~azure.mgmt.storagecache.models.UnknownTarget
:param target_base_type: Required. Constant filled by server.
:type target_base_type: str
:param target_type: Required. Constant filled by server.
:type target_type: str
"""

_validation = {
'target_base_type': {'required': True},
'target_type': {'required': True},
}

_attribute_map = {
'junctions': {'key': 'junctions', 'type': '[NamespaceJunction]'},
'target_type': {'key': 'targetType', 'type': 'str'},
'provisioning_state': {'key': 'provisioningState', 'type': 'str'},
'nfs3': {'key': 'nfs3', 'type': 'Nfs3Target'},
'clfs': {'key': 'clfs', 'type': 'ClfsTarget'},
'unknown': {'key': 'unknown', 'type': 'UnknownTarget'},
'target_base_type': {'key': 'targetBaseType', 'type': 'str'},
'target_type': {'key': 'targetType', 'type': 'str'},
}

def __init__(self, **kwargs):
super(Nfs3TargetProperties, self).__init__(**kwargs)
self.target_base_type = 'nfs3'
self.target_type = 'nfs3'


class ResourceSku(Model):
Expand Down Expand Up @@ -840,8 +886,6 @@ class StorageTarget(StorageTargetResource):
:param junctions: List of Cache namespace junctions to target for
namespace associations.
:type junctions: list[~azure.mgmt.storagecache.models.NamespaceJunction]
:param target_type: Type of the Storage Target.
:type target_type: str
:param provisioning_state: ARM provisioning state, see
https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/Addendum.md#provisioningstate-property.
Possible values include: 'Succeeded', 'Failed', 'Cancelled', 'Creating',
Expand All @@ -867,7 +911,6 @@ class StorageTarget(StorageTargetResource):
'id': {'key': 'id', 'type': 'str'},
'type': {'key': 'type', 'type': 'str'},
'junctions': {'key': 'properties.junctions', 'type': '[NamespaceJunction]'},
'target_type': {'key': 'properties.targetType', 'type': 'str'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'nfs3': {'key': 'properties.nfs3', 'type': 'Nfs3Target'},
'clfs': {'key': 'properties.clfs', 'type': 'ClfsTarget'},
Expand All @@ -877,7 +920,6 @@ class StorageTarget(StorageTargetResource):
def __init__(self, **kwargs):
super(StorageTarget, self).__init__(**kwargs)
self.junctions = kwargs.get('junctions', None)
self.target_type = kwargs.get('target_type', None)
self.provisioning_state = kwargs.get('provisioning_state', None)
self.nfs3 = kwargs.get('nfs3', None)
self.clfs = kwargs.get('clfs', None)
Expand Down Expand Up @@ -909,8 +951,6 @@ class UnknownTargetProperties(StorageTargetProperties):
:param junctions: List of Cache namespace junctions to target for
namespace associations.
:type junctions: list[~azure.mgmt.storagecache.models.NamespaceJunction]
:param target_type: Type of the Storage Target.
:type target_type: str
:param provisioning_state: ARM provisioning state, see
https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/Addendum.md#provisioningstate-property.
Possible values include: 'Succeeded', 'Failed', 'Cancelled', 'Creating',
Expand All @@ -923,27 +963,26 @@ class UnknownTargetProperties(StorageTargetProperties):
:type clfs: ~azure.mgmt.storagecache.models.ClfsTarget
:param unknown: Properties when targetType is unknown.
:type unknown: ~azure.mgmt.storagecache.models.UnknownTarget
:param target_base_type: Required. Constant filled by server.
:type target_base_type: str
:param target_type: Required. Constant filled by server.
:type target_type: str
"""

_validation = {
'target_base_type': {'required': True},
'target_type': {'required': True},
}

_attribute_map = {
'junctions': {'key': 'junctions', 'type': '[NamespaceJunction]'},
'target_type': {'key': 'targetType', 'type': 'str'},
'provisioning_state': {'key': 'provisioningState', 'type': 'str'},
'nfs3': {'key': 'nfs3', 'type': 'Nfs3Target'},
'clfs': {'key': 'clfs', 'type': 'ClfsTarget'},
'unknown': {'key': 'unknown', 'type': 'UnknownTarget'},
'target_base_type': {'key': 'targetBaseType', 'type': 'str'},
'target_type': {'key': 'targetType', 'type': 'str'},
}

def __init__(self, **kwargs):
super(UnknownTargetProperties, self).__init__(**kwargs)
self.target_base_type = 'unknown'
self.target_type = 'unknown'


class UsageModel(Model):
Expand Down
Loading

0 comments on commit 0d69fe4

Please sign in to comment.