diff --git a/sdk/appplatform/azure-mgmt-appplatform/MANIFEST.in b/sdk/appplatform/azure-mgmt-appplatform/MANIFEST.in index a3cb07df8765..3a9b6517412b 100644 --- a/sdk/appplatform/azure-mgmt-appplatform/MANIFEST.in +++ b/sdk/appplatform/azure-mgmt-appplatform/MANIFEST.in @@ -1,3 +1,4 @@ +include _meta.json recursive-include tests *.py *.yaml include *.md include azure/__init__.py diff --git a/sdk/appplatform/azure-mgmt-appplatform/_meta.json b/sdk/appplatform/azure-mgmt-appplatform/_meta.json new file mode 100644 index 000000000000..10ab1b7da1c6 --- /dev/null +++ b/sdk/appplatform/azure-mgmt-appplatform/_meta.json @@ -0,0 +1,8 @@ +{ + "autorest": "V2", + "use": "@microsoft.azure/autorest.python@~4.0.71", + "commit": "c6921b27ac6d8d3525f03bb0230f362717e2abeb", + "repository_url": "https://github.com/Azure/azure-rest-api-specs", + "autorest_command": "autorest specification/appplatform/resource-manager/readme.md --keep-version-file --multiapi --no-async --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk --use=@microsoft.azure/autorest.python@~4.0.71 --version=V2", + "readme": "specification/appplatform/resource-manager/readme.md" +} \ No newline at end of file diff --git a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview/models/__init__.py b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview/models/__init__.py index 05307b382a42..e14ef4761e67 100644 --- a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview/models/__init__.py +++ b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview/models/__init__.py @@ -46,6 +46,7 @@ from ._models_py3 import PersistentDisk from ._models_py3 import ProxyResource from ._models_py3 import RegenerateTestKeyRequestPayload + from ._models_py3 import RequiredTraffic from ._models_py3 import Resource from ._models_py3 import ResourceSku from ._models_py3 import ResourceSkuCapabilities @@ -101,6 +102,7 @@ from ._models import PersistentDisk from ._models import ProxyResource from ._models import RegenerateTestKeyRequestPayload + from ._models import RequiredTraffic from ._models import Resource from ._models import ResourceSku from ._models import ResourceSkuCapabilities @@ -131,6 +133,7 @@ ProvisioningState, ConfigServerState, TraceProxyState, + TrafficDirection, ManagedIdentityType, TestKeyType, AppResourceProvisioningState, @@ -182,6 +185,7 @@ 'PersistentDisk', 'ProxyResource', 'RegenerateTestKeyRequestPayload', + 'RequiredTraffic', 'Resource', 'ResourceSku', 'ResourceSkuCapabilities', @@ -211,6 +215,7 @@ 'ProvisioningState', 'ConfigServerState', 'TraceProxyState', + 'TrafficDirection', 'ManagedIdentityType', 'TestKeyType', 'AppResourceProvisioningState', diff --git a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview/models/_app_platform_management_client_enums.py b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview/models/_app_platform_management_client_enums.py index bcd6f5bb797f..86e2ecb6f68c 100644 --- a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview/models/_app_platform_management_client_enums.py +++ b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview/models/_app_platform_management_client_enums.py @@ -42,6 +42,12 @@ class TraceProxyState(str, Enum): updating = "Updating" +class TrafficDirection(str, Enum): + + inbound = "Inbound" + outbound = "Outbound" + + class ManagedIdentityType(str, Enum): none = "None" diff --git a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview/models/_models.py b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview/models/_models.py index 6db50d936807..7aefd8b41dba 100644 --- a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview/models/_models.py +++ b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview/models/_models.py @@ -140,7 +140,8 @@ class AppResourceProperties(Model): :type active_deployment_name: str :param fqdn: Fully qualified dns Name. :type fqdn: str - :param https_only: Indicate if only https is allowed. + :param https_only: Indicate if only https is allowed. Default value: False + . :type https_only: bool :ivar created_time: Date time when the resource is created :vartype created_time: datetime @@ -177,7 +178,7 @@ def __init__(self, **kwargs): self.provisioning_state = None self.active_deployment_name = kwargs.get('active_deployment_name', None) self.fqdn = kwargs.get('fqdn', None) - self.https_only = kwargs.get('https_only', None) + self.https_only = kwargs.get('https_only', False) self.created_time = None self.temporary_disk = kwargs.get('temporary_disk', None) self.persistent_disk = kwargs.get('persistent_disk', None) @@ -901,7 +902,7 @@ class DeploymentSettings(Model): :param environment_variables: Collection of environment variables :type environment_variables: dict[str, str] :param runtime_version: Runtime version. Possible values include: - 'Java_8', 'Java_11', 'NetCore_31' + 'Java_8', 'Java_11', 'NetCore_31'. Default value: "Java_8" . :type runtime_version: str or ~azure.mgmt.appplatform.v2019_05_01_preview.models.RuntimeVersion """ @@ -924,7 +925,7 @@ def __init__(self, **kwargs): self.net_core_main_entry_path = kwargs.get('net_core_main_entry_path', None) self.instance_count = kwargs.get('instance_count', 1) self.environment_variables = kwargs.get('environment_variables', None) - self.runtime_version = kwargs.get('runtime_version', None) + self.runtime_version = kwargs.get('runtime_version', "Java_8") class Error(Model): @@ -1238,10 +1239,15 @@ class NetworkProfile(Model): instance. :vartype outbound_ips: ~azure.mgmt.appplatform.v2019_05_01_preview.models.NetworkProfileOutboundIPs + :ivar required_traffics: Required inbound or outbound traffics for Azure + Spring Cloud instance. + :vartype required_traffics: + list[~azure.mgmt.appplatform.v2019_05_01_preview.models.RequiredTraffic] """ _validation = { 'outbound_ips': {'readonly': True}, + 'required_traffics': {'readonly': True}, } _attribute_map = { @@ -1251,6 +1257,7 @@ class NetworkProfile(Model): 'service_runtime_network_resource_group': {'key': 'serviceRuntimeNetworkResourceGroup', 'type': 'str'}, 'app_network_resource_group': {'key': 'appNetworkResourceGroup', 'type': 'str'}, 'outbound_ips': {'key': 'outboundIPs', 'type': 'NetworkProfileOutboundIPs'}, + 'required_traffics': {'key': 'requiredTraffics', 'type': '[RequiredTraffic]'}, } def __init__(self, **kwargs): @@ -1261,6 +1268,7 @@ def __init__(self, **kwargs): self.service_runtime_network_resource_group = kwargs.get('service_runtime_network_resource_group', None) self.app_network_resource_group = kwargs.get('app_network_resource_group', None) self.outbound_ips = None + self.required_traffics = None class NetworkProfileOutboundIPs(Model): @@ -1421,6 +1429,51 @@ def __init__(self, **kwargs): self.key_type = kwargs.get('key_type', None) +class RequiredTraffic(Model): + """Required inbound or outbound traffic for Azure Spring Cloud instance. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar protocol: The protocol of required traffic + :vartype protocol: str + :ivar port: The port of required traffic + :vartype port: int + :ivar ips: The ip list of required traffic + :vartype ips: list[str] + :ivar fqdns: The FQDN list of required traffic + :vartype fqdns: list[str] + :ivar direction: The direction of required traffic. Possible values + include: 'Inbound', 'Outbound' + :vartype direction: str or + ~azure.mgmt.appplatform.v2019_05_01_preview.models.TrafficDirection + """ + + _validation = { + 'protocol': {'readonly': True}, + 'port': {'readonly': True}, + 'ips': {'readonly': True}, + 'fqdns': {'readonly': True}, + 'direction': {'readonly': True}, + } + + _attribute_map = { + 'protocol': {'key': 'protocol', 'type': 'str'}, + 'port': {'key': 'port', 'type': 'int'}, + 'ips': {'key': 'ips', 'type': '[str]'}, + 'fqdns': {'key': 'fqdns', 'type': '[str]'}, + 'direction': {'key': 'direction', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(RequiredTraffic, self).__init__(**kwargs) + self.protocol = None + self.port = None + self.ips = None + self.fqdns = None + self.direction = None + + class ResourceSku(Model): """Describes an available Azure Spring Cloud SKU. @@ -1724,9 +1777,9 @@ def __init__(self, **kwargs): class Sku(Model): """Sku of Azure Spring Cloud. - :param name: Name of the Sku + :param name: Name of the Sku. Default value: "S0" . :type name: str - :param tier: Tier of the Sku + :param tier: Tier of the Sku. Default value: "Standard" . :type tier: str :param capacity: Current capacity of the target resource :type capacity: int @@ -1740,8 +1793,8 @@ class Sku(Model): def __init__(self, **kwargs): super(Sku, self).__init__(**kwargs) - self.name = kwargs.get('name', None) - self.tier = kwargs.get('tier', None) + self.name = kwargs.get('name', "S0") + self.tier = kwargs.get('tier', "Standard") self.capacity = kwargs.get('capacity', None) diff --git a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview/models/_models_py3.py b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview/models/_models_py3.py index d781484b060b..71ca8854781b 100644 --- a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview/models/_models_py3.py +++ b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2019_05_01_preview/models/_models_py3.py @@ -140,7 +140,8 @@ class AppResourceProperties(Model): :type active_deployment_name: str :param fqdn: Fully qualified dns Name. :type fqdn: str - :param https_only: Indicate if only https is allowed. + :param https_only: Indicate if only https is allowed. Default value: False + . :type https_only: bool :ivar created_time: Date time when the resource is created :vartype created_time: datetime @@ -170,7 +171,7 @@ class AppResourceProperties(Model): 'persistent_disk': {'key': 'persistentDisk', 'type': 'PersistentDisk'}, } - def __init__(self, *, public: bool=None, active_deployment_name: str=None, fqdn: str=None, https_only: bool=None, temporary_disk=None, persistent_disk=None, **kwargs) -> None: + def __init__(self, *, public: bool=None, active_deployment_name: str=None, fqdn: str=None, https_only: bool=False, temporary_disk=None, persistent_disk=None, **kwargs) -> None: super(AppResourceProperties, self).__init__(**kwargs) self.public = public self.url = None @@ -901,7 +902,7 @@ class DeploymentSettings(Model): :param environment_variables: Collection of environment variables :type environment_variables: dict[str, str] :param runtime_version: Runtime version. Possible values include: - 'Java_8', 'Java_11', 'NetCore_31' + 'Java_8', 'Java_11', 'NetCore_31'. Default value: "Java_8" . :type runtime_version: str or ~azure.mgmt.appplatform.v2019_05_01_preview.models.RuntimeVersion """ @@ -916,7 +917,7 @@ class DeploymentSettings(Model): 'runtime_version': {'key': 'runtimeVersion', 'type': 'str'}, } - def __init__(self, *, cpu: int=1, memory_in_gb: int=1, jvm_options: str=None, net_core_main_entry_path: str=None, instance_count: int=1, environment_variables=None, runtime_version=None, **kwargs) -> None: + def __init__(self, *, cpu: int=1, memory_in_gb: int=1, jvm_options: str=None, net_core_main_entry_path: str=None, instance_count: int=1, environment_variables=None, runtime_version="Java_8", **kwargs) -> None: super(DeploymentSettings, self).__init__(**kwargs) self.cpu = cpu self.memory_in_gb = memory_in_gb @@ -1238,10 +1239,15 @@ class NetworkProfile(Model): instance. :vartype outbound_ips: ~azure.mgmt.appplatform.v2019_05_01_preview.models.NetworkProfileOutboundIPs + :ivar required_traffics: Required inbound or outbound traffics for Azure + Spring Cloud instance. + :vartype required_traffics: + list[~azure.mgmt.appplatform.v2019_05_01_preview.models.RequiredTraffic] """ _validation = { 'outbound_ips': {'readonly': True}, + 'required_traffics': {'readonly': True}, } _attribute_map = { @@ -1251,6 +1257,7 @@ class NetworkProfile(Model): 'service_runtime_network_resource_group': {'key': 'serviceRuntimeNetworkResourceGroup', 'type': 'str'}, 'app_network_resource_group': {'key': 'appNetworkResourceGroup', 'type': 'str'}, 'outbound_ips': {'key': 'outboundIPs', 'type': 'NetworkProfileOutboundIPs'}, + 'required_traffics': {'key': 'requiredTraffics', 'type': '[RequiredTraffic]'}, } def __init__(self, *, service_runtime_subnet_id: str=None, app_subnet_id: str=None, service_cidr: str=None, service_runtime_network_resource_group: str=None, app_network_resource_group: str=None, **kwargs) -> None: @@ -1261,6 +1268,7 @@ def __init__(self, *, service_runtime_subnet_id: str=None, app_subnet_id: str=No self.service_runtime_network_resource_group = service_runtime_network_resource_group self.app_network_resource_group = app_network_resource_group self.outbound_ips = None + self.required_traffics = None class NetworkProfileOutboundIPs(Model): @@ -1421,6 +1429,51 @@ def __init__(self, *, key_type, **kwargs) -> None: self.key_type = key_type +class RequiredTraffic(Model): + """Required inbound or outbound traffic for Azure Spring Cloud instance. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar protocol: The protocol of required traffic + :vartype protocol: str + :ivar port: The port of required traffic + :vartype port: int + :ivar ips: The ip list of required traffic + :vartype ips: list[str] + :ivar fqdns: The FQDN list of required traffic + :vartype fqdns: list[str] + :ivar direction: The direction of required traffic. Possible values + include: 'Inbound', 'Outbound' + :vartype direction: str or + ~azure.mgmt.appplatform.v2019_05_01_preview.models.TrafficDirection + """ + + _validation = { + 'protocol': {'readonly': True}, + 'port': {'readonly': True}, + 'ips': {'readonly': True}, + 'fqdns': {'readonly': True}, + 'direction': {'readonly': True}, + } + + _attribute_map = { + 'protocol': {'key': 'protocol', 'type': 'str'}, + 'port': {'key': 'port', 'type': 'int'}, + 'ips': {'key': 'ips', 'type': '[str]'}, + 'fqdns': {'key': 'fqdns', 'type': '[str]'}, + 'direction': {'key': 'direction', 'type': 'str'}, + } + + def __init__(self, **kwargs) -> None: + super(RequiredTraffic, self).__init__(**kwargs) + self.protocol = None + self.port = None + self.ips = None + self.fqdns = None + self.direction = None + + class ResourceSku(Model): """Describes an available Azure Spring Cloud SKU. @@ -1724,9 +1777,9 @@ def __init__(self, *, log_specifications=None, metric_specifications=None, **kwa class Sku(Model): """Sku of Azure Spring Cloud. - :param name: Name of the Sku + :param name: Name of the Sku. Default value: "S0" . :type name: str - :param tier: Tier of the Sku + :param tier: Tier of the Sku. Default value: "Standard" . :type tier: str :param capacity: Current capacity of the target resource :type capacity: int @@ -1738,7 +1791,7 @@ class Sku(Model): 'capacity': {'key': 'capacity', 'type': 'int'}, } - def __init__(self, *, name: str=None, tier: str=None, capacity: int=None, **kwargs) -> None: + def __init__(self, *, name: str="S0", tier: str="Standard", capacity: int=None, **kwargs) -> None: super(Sku, self).__init__(**kwargs) self.name = name self.tier = tier diff --git a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_07_01/models/__init__.py b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_07_01/models/__init__.py index 4ce60886aabf..938b11a517a8 100644 --- a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_07_01/models/__init__.py +++ b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_07_01/models/__init__.py @@ -51,6 +51,7 @@ from ._models_py3 import PersistentDisk from ._models_py3 import ProxyResource from ._models_py3 import RegenerateTestKeyRequestPayload + from ._models_py3 import RequiredTraffic from ._models_py3 import Resource from ._models_py3 import ResourceSku from ._models_py3 import ResourceSkuCapabilities @@ -110,6 +111,7 @@ from ._models import PersistentDisk from ._models import ProxyResource from ._models import RegenerateTestKeyRequestPayload + from ._models import RequiredTraffic from ._models import Resource from ._models import ResourceSku from ._models import ResourceSkuCapabilities @@ -137,6 +139,7 @@ from ._paged_models import ServiceResourcePaged from ._app_platform_management_client_enums import ( ProvisioningState, + TrafficDirection, ManagedIdentityType, ConfigServerState, MonitoringSettingState, @@ -195,6 +198,7 @@ 'PersistentDisk', 'ProxyResource', 'RegenerateTestKeyRequestPayload', + 'RequiredTraffic', 'Resource', 'ResourceSku', 'ResourceSkuCapabilities', @@ -221,6 +225,7 @@ 'OperationDetailPaged', 'ResourceSkuPaged', 'ProvisioningState', + 'TrafficDirection', 'ManagedIdentityType', 'ConfigServerState', 'MonitoringSettingState', diff --git a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_07_01/models/_app_platform_management_client_enums.py b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_07_01/models/_app_platform_management_client_enums.py index b24c61016427..5ae8632fbad8 100644 --- a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_07_01/models/_app_platform_management_client_enums.py +++ b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_07_01/models/_app_platform_management_client_enums.py @@ -25,6 +25,12 @@ class ProvisioningState(str, Enum): move_failed = "MoveFailed" +class TrafficDirection(str, Enum): + + inbound = "Inbound" + outbound = "Outbound" + + class ManagedIdentityType(str, Enum): none = "None" diff --git a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_07_01/models/_models.py b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_07_01/models/_models.py index 899625f1fad8..45728a5ee6dd 100644 --- a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_07_01/models/_models.py +++ b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_07_01/models/_models.py @@ -140,7 +140,8 @@ class AppResourceProperties(Model): :type active_deployment_name: str :param fqdn: Fully qualified dns Name. :type fqdn: str - :param https_only: Indicate if only https is allowed. + :param https_only: Indicate if only https is allowed. Default value: False + . :type https_only: bool :ivar created_time: Date time when the resource is created :vartype created_time: datetime @@ -177,7 +178,7 @@ def __init__(self, **kwargs): self.provisioning_state = None self.active_deployment_name = kwargs.get('active_deployment_name', None) self.fqdn = kwargs.get('fqdn', None) - self.https_only = kwargs.get('https_only', None) + self.https_only = kwargs.get('https_only', False) self.created_time = None self.temporary_disk = kwargs.get('temporary_disk', None) self.persistent_disk = kwargs.get('persistent_disk', None) @@ -965,7 +966,7 @@ class DeploymentSettings(Model): :param environment_variables: Collection of environment variables :type environment_variables: dict[str, str] :param runtime_version: Runtime version. Possible values include: - 'Java_8', 'Java_11', 'NetCore_31' + 'Java_8', 'Java_11', 'NetCore_31'. Default value: "Java_8" . :type runtime_version: str or ~azure.mgmt.appplatform.v2020_07_01.models.RuntimeVersion """ @@ -986,7 +987,7 @@ def __init__(self, **kwargs): self.jvm_options = kwargs.get('jvm_options', None) self.net_core_main_entry_path = kwargs.get('net_core_main_entry_path', None) self.environment_variables = kwargs.get('environment_variables', None) - self.runtime_version = kwargs.get('runtime_version', None) + self.runtime_version = kwargs.get('runtime_version', "Java_8") class Error(Model): @@ -1368,10 +1369,15 @@ class NetworkProfile(Model): instance. :vartype outbound_ips: ~azure.mgmt.appplatform.v2020_07_01.models.NetworkProfileOutboundIPs + :ivar required_traffics: Required inbound or outbound traffics for Azure + Spring Cloud instance. + :vartype required_traffics: + list[~azure.mgmt.appplatform.v2020_07_01.models.RequiredTraffic] """ _validation = { 'outbound_ips': {'readonly': True}, + 'required_traffics': {'readonly': True}, } _attribute_map = { @@ -1381,6 +1387,7 @@ class NetworkProfile(Model): 'service_runtime_network_resource_group': {'key': 'serviceRuntimeNetworkResourceGroup', 'type': 'str'}, 'app_network_resource_group': {'key': 'appNetworkResourceGroup', 'type': 'str'}, 'outbound_ips': {'key': 'outboundIPs', 'type': 'NetworkProfileOutboundIPs'}, + 'required_traffics': {'key': 'requiredTraffics', 'type': '[RequiredTraffic]'}, } def __init__(self, **kwargs): @@ -1391,6 +1398,7 @@ def __init__(self, **kwargs): self.service_runtime_network_resource_group = kwargs.get('service_runtime_network_resource_group', None) self.app_network_resource_group = kwargs.get('app_network_resource_group', None) self.outbound_ips = None + self.required_traffics = None class NetworkProfileOutboundIPs(Model): @@ -1550,6 +1558,51 @@ def __init__(self, **kwargs): self.key_type = kwargs.get('key_type', None) +class RequiredTraffic(Model): + """Required inbound or outbound traffic for Azure Spring Cloud instance. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar protocol: The protocol of required traffic + :vartype protocol: str + :ivar port: The port of required traffic + :vartype port: int + :ivar ips: The ip list of required traffic + :vartype ips: list[str] + :ivar fqdns: The FQDN list of required traffic + :vartype fqdns: list[str] + :ivar direction: The direction of required traffic. Possible values + include: 'Inbound', 'Outbound' + :vartype direction: str or + ~azure.mgmt.appplatform.v2020_07_01.models.TrafficDirection + """ + + _validation = { + 'protocol': {'readonly': True}, + 'port': {'readonly': True}, + 'ips': {'readonly': True}, + 'fqdns': {'readonly': True}, + 'direction': {'readonly': True}, + } + + _attribute_map = { + 'protocol': {'key': 'protocol', 'type': 'str'}, + 'port': {'key': 'port', 'type': 'int'}, + 'ips': {'key': 'ips', 'type': '[str]'}, + 'fqdns': {'key': 'fqdns', 'type': '[str]'}, + 'direction': {'key': 'direction', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(RequiredTraffic, self).__init__(**kwargs) + self.protocol = None + self.port = None + self.ips = None + self.fqdns = None + self.direction = None + + class ResourceSku(Model): """Describes an available Azure Spring Cloud SKU. diff --git a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_07_01/models/_models_py3.py b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_07_01/models/_models_py3.py index 261e7655946e..841c3d2521ab 100644 --- a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_07_01/models/_models_py3.py +++ b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_07_01/models/_models_py3.py @@ -140,7 +140,8 @@ class AppResourceProperties(Model): :type active_deployment_name: str :param fqdn: Fully qualified dns Name. :type fqdn: str - :param https_only: Indicate if only https is allowed. + :param https_only: Indicate if only https is allowed. Default value: False + . :type https_only: bool :ivar created_time: Date time when the resource is created :vartype created_time: datetime @@ -170,7 +171,7 @@ class AppResourceProperties(Model): 'persistent_disk': {'key': 'persistentDisk', 'type': 'PersistentDisk'}, } - def __init__(self, *, public: bool=None, active_deployment_name: str=None, fqdn: str=None, https_only: bool=None, temporary_disk=None, persistent_disk=None, **kwargs) -> None: + def __init__(self, *, public: bool=None, active_deployment_name: str=None, fqdn: str=None, https_only: bool=False, temporary_disk=None, persistent_disk=None, **kwargs) -> None: super(AppResourceProperties, self).__init__(**kwargs) self.public = public self.url = None @@ -965,7 +966,7 @@ class DeploymentSettings(Model): :param environment_variables: Collection of environment variables :type environment_variables: dict[str, str] :param runtime_version: Runtime version. Possible values include: - 'Java_8', 'Java_11', 'NetCore_31' + 'Java_8', 'Java_11', 'NetCore_31'. Default value: "Java_8" . :type runtime_version: str or ~azure.mgmt.appplatform.v2020_07_01.models.RuntimeVersion """ @@ -979,7 +980,7 @@ class DeploymentSettings(Model): 'runtime_version': {'key': 'runtimeVersion', 'type': 'str'}, } - def __init__(self, *, cpu: int=1, memory_in_gb: int=1, jvm_options: str=None, net_core_main_entry_path: str=None, environment_variables=None, runtime_version=None, **kwargs) -> None: + def __init__(self, *, cpu: int=1, memory_in_gb: int=1, jvm_options: str=None, net_core_main_entry_path: str=None, environment_variables=None, runtime_version="Java_8", **kwargs) -> None: super(DeploymentSettings, self).__init__(**kwargs) self.cpu = cpu self.memory_in_gb = memory_in_gb @@ -1368,10 +1369,15 @@ class NetworkProfile(Model): instance. :vartype outbound_ips: ~azure.mgmt.appplatform.v2020_07_01.models.NetworkProfileOutboundIPs + :ivar required_traffics: Required inbound or outbound traffics for Azure + Spring Cloud instance. + :vartype required_traffics: + list[~azure.mgmt.appplatform.v2020_07_01.models.RequiredTraffic] """ _validation = { 'outbound_ips': {'readonly': True}, + 'required_traffics': {'readonly': True}, } _attribute_map = { @@ -1381,6 +1387,7 @@ class NetworkProfile(Model): 'service_runtime_network_resource_group': {'key': 'serviceRuntimeNetworkResourceGroup', 'type': 'str'}, 'app_network_resource_group': {'key': 'appNetworkResourceGroup', 'type': 'str'}, 'outbound_ips': {'key': 'outboundIPs', 'type': 'NetworkProfileOutboundIPs'}, + 'required_traffics': {'key': 'requiredTraffics', 'type': '[RequiredTraffic]'}, } def __init__(self, *, service_runtime_subnet_id: str=None, app_subnet_id: str=None, service_cidr: str=None, service_runtime_network_resource_group: str=None, app_network_resource_group: str=None, **kwargs) -> None: @@ -1391,6 +1398,7 @@ def __init__(self, *, service_runtime_subnet_id: str=None, app_subnet_id: str=No self.service_runtime_network_resource_group = service_runtime_network_resource_group self.app_network_resource_group = app_network_resource_group self.outbound_ips = None + self.required_traffics = None class NetworkProfileOutboundIPs(Model): @@ -1550,6 +1558,51 @@ def __init__(self, *, key_type, **kwargs) -> None: self.key_type = key_type +class RequiredTraffic(Model): + """Required inbound or outbound traffic for Azure Spring Cloud instance. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar protocol: The protocol of required traffic + :vartype protocol: str + :ivar port: The port of required traffic + :vartype port: int + :ivar ips: The ip list of required traffic + :vartype ips: list[str] + :ivar fqdns: The FQDN list of required traffic + :vartype fqdns: list[str] + :ivar direction: The direction of required traffic. Possible values + include: 'Inbound', 'Outbound' + :vartype direction: str or + ~azure.mgmt.appplatform.v2020_07_01.models.TrafficDirection + """ + + _validation = { + 'protocol': {'readonly': True}, + 'port': {'readonly': True}, + 'ips': {'readonly': True}, + 'fqdns': {'readonly': True}, + 'direction': {'readonly': True}, + } + + _attribute_map = { + 'protocol': {'key': 'protocol', 'type': 'str'}, + 'port': {'key': 'port', 'type': 'int'}, + 'ips': {'key': 'ips', 'type': '[str]'}, + 'fqdns': {'key': 'fqdns', 'type': '[str]'}, + 'direction': {'key': 'direction', 'type': 'str'}, + } + + def __init__(self, **kwargs) -> None: + super(RequiredTraffic, self).__init__(**kwargs) + self.protocol = None + self.port = None + self.ips = None + self.fqdns = None + self.direction = None + + class ResourceSku(Model): """Describes an available Azure Spring Cloud SKU. diff --git a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_11_01_preview/models/_models.py b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_11_01_preview/models/_models.py index 5e4cb8128dcc..ca41e8b48588 100644 --- a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_11_01_preview/models/_models.py +++ b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_11_01_preview/models/_models.py @@ -163,10 +163,9 @@ class AppResourceProperties(Model): :type active_deployment_name: str :param fqdn: Fully qualified dns Name. :type fqdn: str - :param https_only: Indicate if only https is allowed. + :param https_only: Indicate if only https is allowed. Default value: False + . :type https_only: bool - :param enable_end_to_end_tls: Indicate if end to end TLS is enabled. - :type enable_end_to_end_tls: bool :ivar created_time: Date time when the resource is created :vartype created_time: datetime :param temporary_disk: Temporary disk settings @@ -175,6 +174,9 @@ class AppResourceProperties(Model): :param persistent_disk: Persistent disk settings :type persistent_disk: ~azure.mgmt.appplatform.v2020_11_01_preview.models.PersistentDisk + :param enable_end_to_end_tls: Indicate if end to end TLS is enabled. + Default value: False . + :type enable_end_to_end_tls: bool """ _validation = { @@ -190,10 +192,10 @@ class AppResourceProperties(Model): 'active_deployment_name': {'key': 'activeDeploymentName', 'type': 'str'}, 'fqdn': {'key': 'fqdn', 'type': 'str'}, 'https_only': {'key': 'httpsOnly', 'type': 'bool'}, - 'enable_end_to_end_tls': {'key': 'enableEndToEndTLS', 'type': 'bool'}, 'created_time': {'key': 'createdTime', 'type': 'iso-8601'}, 'temporary_disk': {'key': 'temporaryDisk', 'type': 'TemporaryDisk'}, 'persistent_disk': {'key': 'persistentDisk', 'type': 'PersistentDisk'}, + 'enable_end_to_end_tls': {'key': 'enableEndToEndTLS', 'type': 'bool'}, } def __init__(self, **kwargs): @@ -203,11 +205,11 @@ def __init__(self, **kwargs): self.provisioning_state = None self.active_deployment_name = kwargs.get('active_deployment_name', None) self.fqdn = kwargs.get('fqdn', None) - self.https_only = kwargs.get('https_only', None) - self.enable_end_to_end_tls = kwargs.get('enable_end_to_end_tls', None) + self.https_only = kwargs.get('https_only', False) self.created_time = None self.temporary_disk = kwargs.get('temporary_disk', None) self.persistent_disk = kwargs.get('persistent_disk', None) + self.enable_end_to_end_tls = kwargs.get('enable_end_to_end_tls', False) class AvailableRuntimeVersions(Model): @@ -994,7 +996,7 @@ class DeploymentSettings(Model): :param environment_variables: Collection of environment variables :type environment_variables: dict[str, str] :param runtime_version: Runtime version. Possible values include: - 'Java_8', 'Java_11', 'NetCore_31' + 'Java_8', 'Java_11', 'NetCore_31'. Default value: "Java_8" . :type runtime_version: str or ~azure.mgmt.appplatform.v2020_11_01_preview.models.RuntimeVersion """ @@ -1015,7 +1017,7 @@ def __init__(self, **kwargs): self.jvm_options = kwargs.get('jvm_options', None) self.net_core_main_entry_path = kwargs.get('net_core_main_entry_path', None) self.environment_variables = kwargs.get('environment_variables', None) - self.runtime_version = kwargs.get('runtime_version', None) + self.runtime_version = kwargs.get('runtime_version', "Java_8") class Error(Model): @@ -1951,9 +1953,9 @@ def __init__(self, **kwargs): class Sku(Model): """Sku of Azure Spring Cloud. - :param name: Name of the Sku + :param name: Name of the Sku. Default value: "S0" . :type name: str - :param tier: Tier of the Sku + :param tier: Tier of the Sku. Default value: "Standard" . :type tier: str :param capacity: Current capacity of the target resource :type capacity: int @@ -1967,8 +1969,8 @@ class Sku(Model): def __init__(self, **kwargs): super(Sku, self).__init__(**kwargs) - self.name = kwargs.get('name', None) - self.tier = kwargs.get('tier', None) + self.name = kwargs.get('name', "S0") + self.tier = kwargs.get('tier', "Standard") self.capacity = kwargs.get('capacity', None) diff --git a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_11_01_preview/models/_models_py3.py b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_11_01_preview/models/_models_py3.py index 7cd772766b30..cc3b81b9847b 100644 --- a/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_11_01_preview/models/_models_py3.py +++ b/sdk/appplatform/azure-mgmt-appplatform/azure/mgmt/appplatform/v2020_11_01_preview/models/_models_py3.py @@ -163,10 +163,9 @@ class AppResourceProperties(Model): :type active_deployment_name: str :param fqdn: Fully qualified dns Name. :type fqdn: str - :param https_only: Indicate if only https is allowed. + :param https_only: Indicate if only https is allowed. Default value: False + . :type https_only: bool - :param enable_end_to_end_tls: Indicate if end to end TLS is enabled. - :type enable_end_to_end_tls: bool :ivar created_time: Date time when the resource is created :vartype created_time: datetime :param temporary_disk: Temporary disk settings @@ -175,6 +174,9 @@ class AppResourceProperties(Model): :param persistent_disk: Persistent disk settings :type persistent_disk: ~azure.mgmt.appplatform.v2020_11_01_preview.models.PersistentDisk + :param enable_end_to_end_tls: Indicate if end to end TLS is enabled. + Default value: False . + :type enable_end_to_end_tls: bool """ _validation = { @@ -190,13 +192,13 @@ class AppResourceProperties(Model): 'active_deployment_name': {'key': 'activeDeploymentName', 'type': 'str'}, 'fqdn': {'key': 'fqdn', 'type': 'str'}, 'https_only': {'key': 'httpsOnly', 'type': 'bool'}, - 'enable_end_to_end_tls': {'key': 'enableEndToEndTLS', 'type': 'bool'}, 'created_time': {'key': 'createdTime', 'type': 'iso-8601'}, 'temporary_disk': {'key': 'temporaryDisk', 'type': 'TemporaryDisk'}, 'persistent_disk': {'key': 'persistentDisk', 'type': 'PersistentDisk'}, + 'enable_end_to_end_tls': {'key': 'enableEndToEndTLS', 'type': 'bool'}, } - def __init__(self, *, public: bool=None, active_deployment_name: str=None, fqdn: str=None, https_only: bool=None, enable_end_to_end_tls: bool=None, temporary_disk=None, persistent_disk=None, **kwargs) -> None: + def __init__(self, *, public: bool=None, active_deployment_name: str=None, fqdn: str=None, https_only: bool=False, temporary_disk=None, persistent_disk=None, enable_end_to_end_tls: bool=False, **kwargs) -> None: super(AppResourceProperties, self).__init__(**kwargs) self.public = public self.url = None @@ -204,10 +206,10 @@ def __init__(self, *, public: bool=None, active_deployment_name: str=None, fqdn: self.active_deployment_name = active_deployment_name self.fqdn = fqdn self.https_only = https_only - self.enable_end_to_end_tls = enable_end_to_end_tls self.created_time = None self.temporary_disk = temporary_disk self.persistent_disk = persistent_disk + self.enable_end_to_end_tls = enable_end_to_end_tls class AvailableRuntimeVersions(Model): @@ -994,7 +996,7 @@ class DeploymentSettings(Model): :param environment_variables: Collection of environment variables :type environment_variables: dict[str, str] :param runtime_version: Runtime version. Possible values include: - 'Java_8', 'Java_11', 'NetCore_31' + 'Java_8', 'Java_11', 'NetCore_31'. Default value: "Java_8" . :type runtime_version: str or ~azure.mgmt.appplatform.v2020_11_01_preview.models.RuntimeVersion """ @@ -1008,7 +1010,7 @@ class DeploymentSettings(Model): 'runtime_version': {'key': 'runtimeVersion', 'type': 'str'}, } - def __init__(self, *, cpu: int=1, memory_in_gb: int=1, jvm_options: str=None, net_core_main_entry_path: str=None, environment_variables=None, runtime_version=None, **kwargs) -> None: + def __init__(self, *, cpu: int=1, memory_in_gb: int=1, jvm_options: str=None, net_core_main_entry_path: str=None, environment_variables=None, runtime_version="Java_8", **kwargs) -> None: super(DeploymentSettings, self).__init__(**kwargs) self.cpu = cpu self.memory_in_gb = memory_in_gb @@ -1951,9 +1953,9 @@ def __init__(self, *, log_specifications=None, metric_specifications=None, **kwa class Sku(Model): """Sku of Azure Spring Cloud. - :param name: Name of the Sku + :param name: Name of the Sku. Default value: "S0" . :type name: str - :param tier: Tier of the Sku + :param tier: Tier of the Sku. Default value: "Standard" . :type tier: str :param capacity: Current capacity of the target resource :type capacity: int @@ -1965,7 +1967,7 @@ class Sku(Model): 'capacity': {'key': 'capacity', 'type': 'int'}, } - def __init__(self, *, name: str=None, tier: str=None, capacity: int=None, **kwargs) -> None: + def __init__(self, *, name: str="S0", tier: str="Standard", capacity: int=None, **kwargs) -> None: super(Sku, self).__init__(**kwargs) self.name = name self.tier = tier