From 85cf561fa11de4140c0289d33d4bcfbfa427a037 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Wed, 5 Sep 2018 11:35:24 +0000 Subject: [PATCH 1/4] Generated from 826440172bdc08f5487b7957774f95b148145eb1 add network profile swagger and examples --- .../mgmt/network/network_management_client.py | 13 + .../network/v2018_08_01/models/__init__.py | 32 ++ .../network/v2018_08_01/models/container.py | 34 ++ .../models/container_network_interface.py | 37 ++ ...ntainer_network_interface_configuration.py | 37 ++ ...terface_configuration_properties_format.py | 36 ++ ...ace_configuration_properties_format_py3.py | 36 ++ ...ner_network_interface_configuration_py3.py | 37 ++ ...ner_network_interface_properties_format.py | 36 ++ ...network_interface_properties_format_py3.py | 36 ++ .../models/container_network_interface_py3.py | 37 ++ .../models/container_properties_format.py | 28 + .../models/container_properties_format_py3.py | 28 + .../v2018_08_01/models/container_py3.py | 34 ++ .../models/ip_configuration_profile.py | 37 ++ ...configuration_profile_properties_format.py | 29 + ...iguration_profile_properties_format_py3.py | 29 + .../models/ip_configuration_profile_py3.py | 37 ++ .../v2018_08_01/models/network_profile.py | 57 ++ .../models/network_profile_paged.py | 27 + .../network_profile_properties_format.py | 36 ++ .../network_profile_properties_format_py3.py | 36 ++ .../v2018_08_01/models/network_profile_py3.py | 57 ++ .../v2018_08_01/network_management_client.py | 5 + .../v2018_08_01/operations/__init__.py | 2 + .../operations/network_profiles_operations.py | 522 ++++++++++++++++++ 26 files changed, 1335 insertions(+) create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_properties_format.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_properties_format_py3.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_py3.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_properties_format.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_properties_format_py3.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_py3.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_properties_format.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_properties_format_py3.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_py3.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_properties_format.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_properties_format_py3.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_py3.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_paged.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_properties_format.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_properties_format_py3.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_py3.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/network_profiles_operations.py diff --git a/azure-mgmt-network/azure/mgmt/network/network_management_client.py b/azure-mgmt-network/azure/mgmt/network/network_management_client.py index 1eb65437908..6a6de858423 100644 --- a/azure-mgmt-network/azure/mgmt/network/network_management_client.py +++ b/azure-mgmt-network/azure/mgmt/network/network_management_client.py @@ -1432,6 +1432,19 @@ def network_interfaces(self): raise NotImplementedError("APIVersion {} is not available".format(api_version)) return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + @property + def network_profiles(self): + """Instance depends on the API version: + + * 2018-08-01: :class:`NetworkProfilesOperations` + """ + api_version = self._get_api_version('network_profiles') + if api_version == '2018-08-01': + from .v2018_08_01.operations import NetworkProfilesOperations as OperationClass + else: + raise NotImplementedError("APIVersion {} is not available".format(api_version)) + return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + @property def network_security_groups(self): """Instance depends on the API version: diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py index 670793ff7cc..364da62abe8 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py @@ -133,6 +133,16 @@ from .effective_network_security_group_list_result_py3 import EffectiveNetworkSecurityGroupListResult from .effective_route_py3 import EffectiveRoute from .effective_route_list_result_py3 import EffectiveRouteListResult + from .ip_configuration_profile_properties_format_py3 import IPConfigurationProfilePropertiesFormat + from .ip_configuration_profile_py3 import IPConfigurationProfile + from .container_network_interface_configuration_properties_format_py3 import ContainerNetworkInterfaceConfigurationPropertiesFormat + from .container_network_interface_configuration_py3 import ContainerNetworkInterfaceConfiguration + from .container_properties_format_py3 import ContainerPropertiesFormat + from .container_py3 import Container + from .container_network_interface_properties_format_py3 import ContainerNetworkInterfacePropertiesFormat + from .container_network_interface_py3 import ContainerNetworkInterface + from .network_profile_properties_format_py3 import NetworkProfilePropertiesFormat + from .network_profile_py3 import NetworkProfile from .error_response_py3 import ErrorResponse, ErrorResponseException from .network_watcher_py3 import NetworkWatcher from .topology_parameters_py3 import TopologyParameters @@ -378,6 +388,16 @@ from .effective_network_security_group_list_result import EffectiveNetworkSecurityGroupListResult from .effective_route import EffectiveRoute from .effective_route_list_result import EffectiveRouteListResult + from .ip_configuration_profile_properties_format import IPConfigurationProfilePropertiesFormat + from .ip_configuration_profile import IPConfigurationProfile + from .container_network_interface_configuration_properties_format import ContainerNetworkInterfaceConfigurationPropertiesFormat + from .container_network_interface_configuration import ContainerNetworkInterfaceConfiguration + from .container_properties_format import ContainerPropertiesFormat + from .container import Container + from .container_network_interface_properties_format import ContainerNetworkInterfacePropertiesFormat + from .container_network_interface import ContainerNetworkInterface + from .network_profile_properties_format import NetworkProfilePropertiesFormat + from .network_profile import NetworkProfile from .error_response import ErrorResponse, ErrorResponseException from .network_watcher import NetworkWatcher from .topology_parameters import TopologyParameters @@ -522,6 +542,7 @@ from .probe_paged import ProbePaged from .network_interface_ip_configuration_paged import NetworkInterfaceIPConfigurationPaged from .network_interface_tap_configuration_paged import NetworkInterfaceTapConfigurationPaged +from .network_profile_paged import NetworkProfilePaged from .network_security_group_paged import NetworkSecurityGroupPaged from .security_rule_paged import SecurityRulePaged from .network_watcher_paged import NetworkWatcherPaged @@ -760,6 +781,16 @@ 'EffectiveNetworkSecurityGroupListResult', 'EffectiveRoute', 'EffectiveRouteListResult', + 'IPConfigurationProfilePropertiesFormat', + 'IPConfigurationProfile', + 'ContainerNetworkInterfaceConfigurationPropertiesFormat', + 'ContainerNetworkInterfaceConfiguration', + 'ContainerPropertiesFormat', + 'Container', + 'ContainerNetworkInterfacePropertiesFormat', + 'ContainerNetworkInterface', + 'NetworkProfilePropertiesFormat', + 'NetworkProfile', 'ErrorResponse', 'ErrorResponseException', 'NetworkWatcher', 'TopologyParameters', @@ -904,6 +935,7 @@ 'ProbePaged', 'NetworkInterfaceIPConfigurationPaged', 'NetworkInterfaceTapConfigurationPaged', + 'NetworkProfilePaged', 'NetworkSecurityGroupPaged', 'SecurityRulePaged', 'NetworkWatcherPaged', diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container.py new file mode 100644 index 00000000000..0ffb3f2c7e2 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container.py @@ -0,0 +1,34 @@ +# 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 Container(Model): + """Reference to container resource in remote resource provider. + + :param properties: Properties of the container. + :type properties: + ~azure.mgmt.network.v2018_08_01.models.ContainerPropertiesFormat + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _attribute_map = { + 'properties': {'key': 'properties', 'type': 'ContainerPropertiesFormat'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(Container, self).__init__(**kwargs) + self.properties = kwargs.get('properties', None) + self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface.py new file mode 100644 index 00000000000..f7cbaacb748 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface.py @@ -0,0 +1,37 @@ +# 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 .sub_resource import SubResource + + +class ContainerNetworkInterface(SubResource): + """Container network interface child resource. + + :param id: Resource ID. + :type id: str + :param properties: Container network interface properties. + :type properties: + ~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfacePropertiesFormat + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'properties': {'key': 'properties', 'type': 'ContainerNetworkInterfacePropertiesFormat'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ContainerNetworkInterface, self).__init__(**kwargs) + self.properties = kwargs.get('properties', None) + self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration.py new file mode 100644 index 00000000000..7dea95b246a --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration.py @@ -0,0 +1,37 @@ +# 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 .sub_resource import SubResource + + +class ContainerNetworkInterfaceConfiguration(SubResource): + """Container network interface configruation child resource. + + :param id: Resource ID. + :type id: str + :param properties: Container network interface configuration properties. + :type properties: + ~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfaceConfigurationPropertiesFormat + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'properties': {'key': 'properties', 'type': 'ContainerNetworkInterfaceConfigurationPropertiesFormat'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ContainerNetworkInterfaceConfiguration, self).__init__(**kwargs) + self.properties = kwargs.get('properties', None) + self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_properties_format.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_properties_format.py new file mode 100644 index 00000000000..9b4e67e783b --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_properties_format.py @@ -0,0 +1,36 @@ +# 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 ContainerNetworkInterfaceConfigurationPropertiesFormat(Model): + """Container network interface configuration properties. + + :param ip_configurations: A list of ip configurations of the container + network interface configuration. + :type ip_configurations: + list[~azure.mgmt.network.v2018_08_01.models.IPConfigurationProfile] + :param container_network_interfaces: A list of container network + interfaces created from this container network interface configuration. + :type container_network_interfaces: + list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterface] + """ + + _attribute_map = { + 'ip_configurations': {'key': 'ipConfigurations', 'type': '[IPConfigurationProfile]'}, + 'container_network_interfaces': {'key': 'containerNetworkInterfaces', 'type': '[ContainerNetworkInterface]'}, + } + + def __init__(self, **kwargs): + super(ContainerNetworkInterfaceConfigurationPropertiesFormat, self).__init__(**kwargs) + self.ip_configurations = kwargs.get('ip_configurations', None) + self.container_network_interfaces = kwargs.get('container_network_interfaces', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_properties_format_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_properties_format_py3.py new file mode 100644 index 00000000000..a718efaf41d --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_properties_format_py3.py @@ -0,0 +1,36 @@ +# 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 ContainerNetworkInterfaceConfigurationPropertiesFormat(Model): + """Container network interface configuration properties. + + :param ip_configurations: A list of ip configurations of the container + network interface configuration. + :type ip_configurations: + list[~azure.mgmt.network.v2018_08_01.models.IPConfigurationProfile] + :param container_network_interfaces: A list of container network + interfaces created from this container network interface configuration. + :type container_network_interfaces: + list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterface] + """ + + _attribute_map = { + 'ip_configurations': {'key': 'ipConfigurations', 'type': '[IPConfigurationProfile]'}, + 'container_network_interfaces': {'key': 'containerNetworkInterfaces', 'type': '[ContainerNetworkInterface]'}, + } + + def __init__(self, *, ip_configurations=None, container_network_interfaces=None, **kwargs) -> None: + super(ContainerNetworkInterfaceConfigurationPropertiesFormat, self).__init__(**kwargs) + self.ip_configurations = ip_configurations + self.container_network_interfaces = container_network_interfaces diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_py3.py new file mode 100644 index 00000000000..674949ba7df --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_py3.py @@ -0,0 +1,37 @@ +# 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 .sub_resource_py3 import SubResource + + +class ContainerNetworkInterfaceConfiguration(SubResource): + """Container network interface configruation child resource. + + :param id: Resource ID. + :type id: str + :param properties: Container network interface configuration properties. + :type properties: + ~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfaceConfigurationPropertiesFormat + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'properties': {'key': 'properties', 'type': 'ContainerNetworkInterfaceConfigurationPropertiesFormat'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, *, id: str=None, properties=None, etag: str=None, **kwargs) -> None: + super(ContainerNetworkInterfaceConfiguration, self).__init__(id=id, **kwargs) + self.properties = properties + self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_properties_format.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_properties_format.py new file mode 100644 index 00000000000..6f317bc6761 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_properties_format.py @@ -0,0 +1,36 @@ +# 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 ContainerNetworkInterfacePropertiesFormat(Model): + """ContainerNetworkInterfacePropertiesFormat. + + :param container_network_interface_configuration: Container network + interface configuration from which this container network interface is + created. + :type container_network_interface_configuration: + ~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfaceConfiguration + :param container: Reference to the conatinaer to which this container + network interface is attached. + :type container: ~azure.mgmt.network.v2018_08_01.models.Container + """ + + _attribute_map = { + 'container_network_interface_configuration': {'key': 'containerNetworkInterfaceConfiguration', 'type': 'ContainerNetworkInterfaceConfiguration'}, + 'container': {'key': 'container', 'type': 'Container'}, + } + + def __init__(self, **kwargs): + super(ContainerNetworkInterfacePropertiesFormat, self).__init__(**kwargs) + self.container_network_interface_configuration = kwargs.get('container_network_interface_configuration', None) + self.container = kwargs.get('container', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_properties_format_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_properties_format_py3.py new file mode 100644 index 00000000000..fdd833e5991 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_properties_format_py3.py @@ -0,0 +1,36 @@ +# 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 ContainerNetworkInterfacePropertiesFormat(Model): + """ContainerNetworkInterfacePropertiesFormat. + + :param container_network_interface_configuration: Container network + interface configuration from which this container network interface is + created. + :type container_network_interface_configuration: + ~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfaceConfiguration + :param container: Reference to the conatinaer to which this container + network interface is attached. + :type container: ~azure.mgmt.network.v2018_08_01.models.Container + """ + + _attribute_map = { + 'container_network_interface_configuration': {'key': 'containerNetworkInterfaceConfiguration', 'type': 'ContainerNetworkInterfaceConfiguration'}, + 'container': {'key': 'container', 'type': 'Container'}, + } + + def __init__(self, *, container_network_interface_configuration=None, container=None, **kwargs) -> None: + super(ContainerNetworkInterfacePropertiesFormat, self).__init__(**kwargs) + self.container_network_interface_configuration = container_network_interface_configuration + self.container = container diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_py3.py new file mode 100644 index 00000000000..3055e1fca04 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_py3.py @@ -0,0 +1,37 @@ +# 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 .sub_resource_py3 import SubResource + + +class ContainerNetworkInterface(SubResource): + """Container network interface child resource. + + :param id: Resource ID. + :type id: str + :param properties: Container network interface properties. + :type properties: + ~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfacePropertiesFormat + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'properties': {'key': 'properties', 'type': 'ContainerNetworkInterfacePropertiesFormat'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, *, id: str=None, properties=None, etag: str=None, **kwargs) -> None: + super(ContainerNetworkInterface, self).__init__(id=id, **kwargs) + self.properties = properties + self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_properties_format.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_properties_format.py new file mode 100644 index 00000000000..373e4b51884 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_properties_format.py @@ -0,0 +1,28 @@ +# 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 ContainerPropertiesFormat(Model): + """Container resource properties. + + :param container_uri: ARM Uri for the container. + :type container_uri: str + """ + + _attribute_map = { + 'container_uri': {'key': 'containerUri', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ContainerPropertiesFormat, self).__init__(**kwargs) + self.container_uri = kwargs.get('container_uri', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_properties_format_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_properties_format_py3.py new file mode 100644 index 00000000000..1f0f9efc4a7 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_properties_format_py3.py @@ -0,0 +1,28 @@ +# 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 ContainerPropertiesFormat(Model): + """Container resource properties. + + :param container_uri: ARM Uri for the container. + :type container_uri: str + """ + + _attribute_map = { + 'container_uri': {'key': 'containerUri', 'type': 'str'}, + } + + def __init__(self, *, container_uri: str=None, **kwargs) -> None: + super(ContainerPropertiesFormat, self).__init__(**kwargs) + self.container_uri = container_uri diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_py3.py new file mode 100644 index 00000000000..234ad2975ec --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_py3.py @@ -0,0 +1,34 @@ +# 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 Container(Model): + """Reference to container resource in remote resource provider. + + :param properties: Properties of the container. + :type properties: + ~azure.mgmt.network.v2018_08_01.models.ContainerPropertiesFormat + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _attribute_map = { + 'properties': {'key': 'properties', 'type': 'ContainerPropertiesFormat'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, *, properties=None, etag: str=None, **kwargs) -> None: + super(Container, self).__init__(**kwargs) + self.properties = properties + self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile.py new file mode 100644 index 00000000000..663c33b70ed --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile.py @@ -0,0 +1,37 @@ +# 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 .sub_resource import SubResource + + +class IPConfigurationProfile(SubResource): + """IP configuration profile child resource. + + :param id: Resource ID. + :type id: str + :param properties: Properties of the IP configuration profile. + :type properties: + ~azure.mgmt.network.v2018_08_01.models.IPConfigurationProfilePropertiesFormat + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'properties': {'key': 'properties', 'type': 'IPConfigurationProfilePropertiesFormat'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(IPConfigurationProfile, self).__init__(**kwargs) + self.properties = kwargs.get('properties', None) + self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_properties_format.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_properties_format.py new file mode 100644 index 00000000000..0177cb2e19a --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_properties_format.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 IPConfigurationProfilePropertiesFormat(Model): + """IP configruation profile properties. + + :param subnet: The reference of the subnet resource to create a + contatainer network interface ip configruation. + :type subnet: ~azure.mgmt.network.v2018_08_01.models.Subnet + """ + + _attribute_map = { + 'subnet': {'key': 'subnet', 'type': 'Subnet'}, + } + + def __init__(self, **kwargs): + super(IPConfigurationProfilePropertiesFormat, self).__init__(**kwargs) + self.subnet = kwargs.get('subnet', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_properties_format_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_properties_format_py3.py new file mode 100644 index 00000000000..985fa07ea6c --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_properties_format_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 IPConfigurationProfilePropertiesFormat(Model): + """IP configruation profile properties. + + :param subnet: The reference of the subnet resource to create a + contatainer network interface ip configruation. + :type subnet: ~azure.mgmt.network.v2018_08_01.models.Subnet + """ + + _attribute_map = { + 'subnet': {'key': 'subnet', 'type': 'Subnet'}, + } + + def __init__(self, *, subnet=None, **kwargs) -> None: + super(IPConfigurationProfilePropertiesFormat, self).__init__(**kwargs) + self.subnet = subnet diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_py3.py new file mode 100644 index 00000000000..f1126e1a23f --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_py3.py @@ -0,0 +1,37 @@ +# 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 .sub_resource_py3 import SubResource + + +class IPConfigurationProfile(SubResource): + """IP configuration profile child resource. + + :param id: Resource ID. + :type id: str + :param properties: Properties of the IP configuration profile. + :type properties: + ~azure.mgmt.network.v2018_08_01.models.IPConfigurationProfilePropertiesFormat + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'properties': {'key': 'properties', 'type': 'IPConfigurationProfilePropertiesFormat'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, *, id: str=None, properties=None, etag: str=None, **kwargs) -> None: + super(IPConfigurationProfile, self).__init__(id=id, **kwargs) + self.properties = properties + self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile.py new file mode 100644 index 00000000000..db823dc2698 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile.py @@ -0,0 +1,57 @@ +# 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 .resource import Resource + + +class NetworkProfile(Resource): + """Network profile resource. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param id: Resource ID. + :type id: str + :ivar name: Resource name. + :vartype name: str + :ivar type: Resource type. + :vartype type: str + :param location: Resource location. + :type location: str + :param tags: Resource tags. + :type tags: dict[str, str] + :param properties: Network profile properties. + :type properties: + ~azure.mgmt.network.v2018_08_01.models.NetworkProfilePropertiesFormat + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _validation = { + 'name': {'readonly': True}, + 'type': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'properties': {'key': 'properties', 'type': 'NetworkProfilePropertiesFormat'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(NetworkProfile, self).__init__(**kwargs) + self.properties = kwargs.get('properties', None) + self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_paged.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_paged.py new file mode 100644 index 00000000000..1e95ba3a03c --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_paged.py @@ -0,0 +1,27 @@ +# 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.paging import Paged + + +class NetworkProfilePaged(Paged): + """ + A paging container for iterating over a list of :class:`NetworkProfile ` object + """ + + _attribute_map = { + 'next_link': {'key': 'nextLink', 'type': 'str'}, + 'current_page': {'key': 'value', 'type': '[NetworkProfile]'} + } + + def __init__(self, *args, **kwargs): + + super(NetworkProfilePaged, self).__init__(*args, **kwargs) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_properties_format.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_properties_format.py new file mode 100644 index 00000000000..0f6a5b1d779 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_properties_format.py @@ -0,0 +1,36 @@ +# 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 NetworkProfilePropertiesFormat(Model): + """Network profile properties. + + :param container_network_interfaces: List of child container network + interfaces. + :type container_network_interfaces: + list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterface] + :param container_network_interface_configurations: List of chid container + network interface configurations. + :type container_network_interface_configurations: + list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfaceConfiguration] + """ + + _attribute_map = { + 'container_network_interfaces': {'key': 'containerNetworkInterfaces', 'type': '[ContainerNetworkInterface]'}, + 'container_network_interface_configurations': {'key': 'containerNetworkInterfaceConfigurations', 'type': '[ContainerNetworkInterfaceConfiguration]'}, + } + + def __init__(self, **kwargs): + super(NetworkProfilePropertiesFormat, self).__init__(**kwargs) + self.container_network_interfaces = kwargs.get('container_network_interfaces', None) + self.container_network_interface_configurations = kwargs.get('container_network_interface_configurations', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_properties_format_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_properties_format_py3.py new file mode 100644 index 00000000000..379ee8b7df0 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_properties_format_py3.py @@ -0,0 +1,36 @@ +# 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 NetworkProfilePropertiesFormat(Model): + """Network profile properties. + + :param container_network_interfaces: List of child container network + interfaces. + :type container_network_interfaces: + list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterface] + :param container_network_interface_configurations: List of chid container + network interface configurations. + :type container_network_interface_configurations: + list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfaceConfiguration] + """ + + _attribute_map = { + 'container_network_interfaces': {'key': 'containerNetworkInterfaces', 'type': '[ContainerNetworkInterface]'}, + 'container_network_interface_configurations': {'key': 'containerNetworkInterfaceConfigurations', 'type': '[ContainerNetworkInterfaceConfiguration]'}, + } + + def __init__(self, *, container_network_interfaces=None, container_network_interface_configurations=None, **kwargs) -> None: + super(NetworkProfilePropertiesFormat, self).__init__(**kwargs) + self.container_network_interfaces = container_network_interfaces + self.container_network_interface_configurations = container_network_interface_configurations diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_py3.py new file mode 100644 index 00000000000..183609a4a78 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_py3.py @@ -0,0 +1,57 @@ +# 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 .resource_py3 import Resource + + +class NetworkProfile(Resource): + """Network profile resource. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param id: Resource ID. + :type id: str + :ivar name: Resource name. + :vartype name: str + :ivar type: Resource type. + :vartype type: str + :param location: Resource location. + :type location: str + :param tags: Resource tags. + :type tags: dict[str, str] + :param properties: Network profile properties. + :type properties: + ~azure.mgmt.network.v2018_08_01.models.NetworkProfilePropertiesFormat + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _validation = { + 'name': {'readonly': True}, + 'type': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'location': {'key': 'location', 'type': 'str'}, + 'tags': {'key': 'tags', 'type': '{str}'}, + 'properties': {'key': 'properties', 'type': 'NetworkProfilePropertiesFormat'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, *, id: str=None, location: str=None, tags=None, properties=None, etag: str=None, **kwargs) -> None: + super(NetworkProfile, self).__init__(id=id, location=location, tags=tags, **kwargs) + self.properties = properties + self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/network_management_client.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/network_management_client.py index 260b4d05699..70834be8ac6 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/network_management_client.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/network_management_client.py @@ -45,6 +45,7 @@ from .operations.network_interface_ip_configurations_operations import NetworkInterfaceIPConfigurationsOperations from .operations.network_interface_load_balancers_operations import NetworkInterfaceLoadBalancersOperations from .operations.network_interface_tap_configurations_operations import NetworkInterfaceTapConfigurationsOperations +from .operations.network_profiles_operations import NetworkProfilesOperations from .operations.network_security_groups_operations import NetworkSecurityGroupsOperations from .operations.security_rules_operations import SecurityRulesOperations from .operations.default_security_rules_operations import DefaultSecurityRulesOperations @@ -173,6 +174,8 @@ class NetworkManagementClient(SDKClient): :vartype network_interface_load_balancers: azure.mgmt.network.v2018_08_01.operations.NetworkInterfaceLoadBalancersOperations :ivar network_interface_tap_configurations: NetworkInterfaceTapConfigurations operations :vartype network_interface_tap_configurations: azure.mgmt.network.v2018_08_01.operations.NetworkInterfaceTapConfigurationsOperations + :ivar network_profiles: NetworkProfiles operations + :vartype network_profiles: azure.mgmt.network.v2018_08_01.operations.NetworkProfilesOperations :ivar network_security_groups: NetworkSecurityGroups operations :vartype network_security_groups: azure.mgmt.network.v2018_08_01.operations.NetworkSecurityGroupsOperations :ivar security_rules: SecurityRules operations @@ -310,6 +313,8 @@ def __init__( self._client, self.config, self._serialize, self._deserialize) self.network_interface_tap_configurations = NetworkInterfaceTapConfigurationsOperations( self._client, self.config, self._serialize, self._deserialize) + self.network_profiles = NetworkProfilesOperations( + self._client, self.config, self._serialize, self._deserialize) self.network_security_groups = NetworkSecurityGroupsOperations( self._client, self.config, self._serialize, self._deserialize) self.security_rules = SecurityRulesOperations( diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/__init__.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/__init__.py index c74e9c1eb80..43184da097b 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/__init__.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/__init__.py @@ -36,6 +36,7 @@ from .network_interface_ip_configurations_operations import NetworkInterfaceIPConfigurationsOperations from .network_interface_load_balancers_operations import NetworkInterfaceLoadBalancersOperations from .network_interface_tap_configurations_operations import NetworkInterfaceTapConfigurationsOperations +from .network_profiles_operations import NetworkProfilesOperations from .network_security_groups_operations import NetworkSecurityGroupsOperations from .security_rules_operations import SecurityRulesOperations from .default_security_rules_operations import DefaultSecurityRulesOperations @@ -96,6 +97,7 @@ 'NetworkInterfaceIPConfigurationsOperations', 'NetworkInterfaceLoadBalancersOperations', 'NetworkInterfaceTapConfigurationsOperations', + 'NetworkProfilesOperations', 'NetworkSecurityGroupsOperations', 'SecurityRulesOperations', 'DefaultSecurityRulesOperations', diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/network_profiles_operations.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/network_profiles_operations.py new file mode 100644 index 00000000000..bd0f14eb804 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/network_profiles_operations.py @@ -0,0 +1,522 @@ +# 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. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError +from msrest.polling import LROPoller, NoPolling +from msrestazure.polling.arm_polling import ARMPolling + +from .. import models + + +class NetworkProfilesOperations(object): + """NetworkProfilesOperations operations. + + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + :ivar api_version: Client API version. Constant value: "2018-08-01". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2018-08-01" + + self.config = config + + + def _delete_initial( + self, resource_group_name, network_profile_name, custom_headers=None, raw=False, **operation_config): + # Construct URL + url = self.delete.metadata['url'] + path_format_arguments = { + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'networkProfileName': self._serialize.url("network_profile_name", network_profile_name, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.delete(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [204]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + + def delete( + self, resource_group_name, network_profile_name, custom_headers=None, raw=False, polling=True, **operation_config): + """Deletes the specified network profile. + + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param network_profile_name: The name of the NetworkProfile. + :type network_profile_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns None or + ClientRawResponse if raw==True + :rtype: ~msrestazure.azure_operation.AzureOperationPoller[None] or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[None]] + :raises: :class:`CloudError` + """ + raw_result = self._delete_initial( + resource_group_name=resource_group_name, + network_profile_name=network_profile_name, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + if raw: + client_raw_response = ClientRawResponse(None, response) + return client_raw_response + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkProfiles/{networkProfileName}'} + + def get( + self, resource_group_name, network_profile_name, expand=None, custom_headers=None, raw=False, **operation_config): + """Gets the specified network profile in a specified resource group. + + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param network_profile_name: The name of the PublicIPPrefx. + :type network_profile_name: str + :param expand: Expands referenced resources. + :type expand: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: NetworkProfile or ClientRawResponse if raw=true + :rtype: ~azure.mgmt.network.v2018_08_01.models.NetworkProfile or + ~msrest.pipeline.ClientRawResponse + :raises: :class:`CloudError` + """ + # Construct URL + url = self.get.metadata['url'] + path_format_arguments = { + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'networkProfileName': self._serialize.url("network_profile_name", network_profile_name, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + if expand is not None: + query_parameters['$expand'] = self._serialize.query("expand", expand, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('NetworkProfile', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + get.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkProfiles/{networkProfileName}'} + + + def _create_or_update_initial( + self, resource_group_name, network_profile_name, parameters, custom_headers=None, raw=False, **operation_config): + # Construct URL + url = self.create_or_update.metadata['url'] + path_format_arguments = { + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'networkProfileName': self._serialize.url("network_profile_name", network_profile_name, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct body + body_content = self._serialize.body(parameters, 'NetworkProfile') + + # Construct and send request + request = self._client.put(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200, 201]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('NetworkProfile', response) + if response.status_code == 201: + deserialized = self._deserialize('NetworkProfile', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + def create_or_update( + self, resource_group_name, network_profile_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config): + """Creates or updates a network profile. + + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param network_profile_name: The name of the network profile. + :type network_profile_name: str + :param parameters: Parameters supplied to the create or update network + profile operation. + :type parameters: + ~azure.mgmt.network.v2018_08_01.models.NetworkProfile + :param dict custom_headers: headers that will be added to the request + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns NetworkProfile or + ClientRawResponse if raw==True + :rtype: + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.network.v2018_08_01.models.NetworkProfile] + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.network.v2018_08_01.models.NetworkProfile]] + :raises: :class:`CloudError` + """ + raw_result = self._create_or_update_initial( + resource_group_name=resource_group_name, + network_profile_name=network_profile_name, + parameters=parameters, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + deserialized = self._deserialize('NetworkProfile', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + create_or_update.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkProfiles/{networkProfileName}'} + + + def _update_tags_initial( + self, resource_group_name, network_profile_name, tags=None, custom_headers=None, raw=False, **operation_config): + parameters = models.TagsObject(tags=tags) + + # Construct URL + url = self.update_tags.metadata['url'] + path_format_arguments = { + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'networkProfileName': self._serialize.url("network_profile_name", network_profile_name, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct body + body_content = self._serialize.body(parameters, 'TagsObject') + + # Construct and send request + request = self._client.patch(url, query_parameters, header_parameters, body_content) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('NetworkProfile', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + def update_tags( + self, resource_group_name, network_profile_name, tags=None, custom_headers=None, raw=False, polling=True, **operation_config): + """Updates network profile tags. + + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param network_profile_name: The name of the network profile. + :type network_profile_name: str + :param tags: Resource tags. + :type tags: dict[str, str] + :param dict custom_headers: headers that will be added to the request + :param bool raw: The poller return type is ClientRawResponse, the + direct response alongside the deserialized response + :param polling: True for ARMPolling, False for no polling, or a + polling object for personal polling strategy + :return: An instance of LROPoller that returns NetworkProfile or + ClientRawResponse if raw==True + :rtype: + ~msrestazure.azure_operation.AzureOperationPoller[~azure.mgmt.network.v2018_08_01.models.NetworkProfile] + or + ~msrestazure.azure_operation.AzureOperationPoller[~msrest.pipeline.ClientRawResponse[~azure.mgmt.network.v2018_08_01.models.NetworkProfile]] + :raises: :class:`CloudError` + """ + raw_result = self._update_tags_initial( + resource_group_name=resource_group_name, + network_profile_name=network_profile_name, + tags=tags, + custom_headers=custom_headers, + raw=True, + **operation_config + ) + + def get_long_running_output(response): + deserialized = self._deserialize('NetworkProfile', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + lro_delay = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + if polling is True: polling_method = ARMPolling(lro_delay, **operation_config) + elif polling is False: polling_method = NoPolling() + else: polling_method = polling + return LROPoller(self._client, raw_result, get_long_running_output, polling_method) + update_tags.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkProfiles/{networkProfileName}'} + + def list_all( + self, custom_headers=None, raw=False, **operation_config): + """Gets all the network profiles in a subscription. + + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: An iterator like instance of NetworkProfile + :rtype: + ~azure.mgmt.network.v2018_08_01.models.NetworkProfilePaged[~azure.mgmt.network.v2018_08_01.models.NetworkProfile] + :raises: :class:`CloudError` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list_all.metadata['url'] + path_format_arguments = { + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + return response + + # Deserialize response + deserialized = models.NetworkProfilePaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.NetworkProfilePaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list_all.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Network/networkProfiles'} + + def list( + self, resource_group_name, custom_headers=None, raw=False, **operation_config): + """Gets all network profiles in a resource group. + + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: An iterator like instance of NetworkProfile + :rtype: + ~azure.mgmt.network.v2018_08_01.models.NetworkProfilePaged[~azure.mgmt.network.v2018_08_01.models.NetworkProfile] + :raises: :class:`CloudError` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list.metadata['url'] + path_format_arguments = { + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + return response + + # Deserialize response + deserialized = models.NetworkProfilePaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.NetworkProfilePaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/networkProfiles'} From 9dd9742b9593fb5e8b981b518482386f5ff2786a Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Wed, 5 Sep 2018 20:47:18 +0000 Subject: [PATCH 2/4] Generated from 6880c21d3d21b8fbd64054b2bd01983268115f77 add x-ms-client-flatten property as per feedback --- .../mgmt/network/network_management_client.py | 26 +++++ .../network/v2018_08_01/models/__init__.py | 23 ++-- .../models/available_delegation.py | 46 ++++++++ ...ormat.py => available_delegation_paged.py} | 19 ++- .../models/available_delegation_py3.py | 46 ++++++++ .../network/v2018_08_01/models/container.py | 9 +- .../models/container_network_interface.py | 17 ++- ...ntainer_network_interface_configuration.py | 17 ++- ...terface_configuration_properties_format.py | 36 ------ ...ace_configuration_properties_format_py3.py | 36 ------ ...ner_network_interface_configuration_py3.py | 19 ++- ...ner_network_interface_properties_format.py | 36 ------ ...network_interface_properties_format_py3.py | 36 ------ .../models/container_network_interface_py3.py | 19 ++- .../models/container_properties_format_py3.py | 28 ----- .../v2018_08_01/models/container_py3.py | 11 +- .../network/v2018_08_01/models/delegation.py | 58 ++++++++++ .../v2018_08_01/models/delegation_py3.py | 58 ++++++++++ .../models/ip_configuration_profile.py | 10 +- ...configuration_profile_properties_format.py | 29 ----- ...iguration_profile_properties_format_py3.py | 29 ----- .../models/ip_configuration_profile_py3.py | 12 +- .../v2018_08_01/models/network_profile.py | 17 ++- .../network_profile_properties_format.py | 36 ------ .../network_profile_properties_format_py3.py | 36 ------ .../v2018_08_01/models/network_profile_py3.py | 19 ++- .../mgmt/network/v2018_08_01/models/subnet.py | 11 ++ .../network/v2018_08_01/models/subnet_py3.py | 13 ++- .../v2018_08_01/network_management_client.py | 10 ++ .../v2018_08_01/operations/__init__.py | 4 + .../available_delegations_operations.py | 106 +++++++++++++++++ ...e_resource_group_delegations_operations.py | 109 ++++++++++++++++++ 32 files changed, 598 insertions(+), 383 deletions(-) create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/available_delegation.py rename azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/{container_properties_format.py => available_delegation_paged.py} (52%) create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/available_delegation_py3.py delete mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_properties_format.py delete mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_properties_format_py3.py delete mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_properties_format.py delete mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_properties_format_py3.py delete mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_properties_format_py3.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/delegation.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/delegation_py3.py delete mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_properties_format.py delete mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_properties_format_py3.py delete mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_properties_format.py delete mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_properties_format_py3.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/available_delegations_operations.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/available_resource_group_delegations_operations.py diff --git a/azure-mgmt-network/azure/mgmt/network/network_management_client.py b/azure-mgmt-network/azure/mgmt/network/network_management_client.py index 6a6de858423..50a278dcfdd 100644 --- a/azure-mgmt-network/azure/mgmt/network/network_management_client.py +++ b/azure-mgmt-network/azure/mgmt/network/network_management_client.py @@ -325,6 +325,19 @@ def application_security_groups(self): raise NotImplementedError("APIVersion {} is not available".format(api_version)) return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + @property + def available_delegations(self): + """Instance depends on the API version: + + * 2018-08-01: :class:`AvailableDelegationsOperations` + """ + api_version = self._get_api_version('available_delegations') + if api_version == '2018-08-01': + from .v2018_08_01.operations import AvailableDelegationsOperations as OperationClass + else: + raise NotImplementedError("APIVersion {} is not available".format(api_version)) + return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + @property def available_endpoint_services(self): """Instance depends on the API version: @@ -368,6 +381,19 @@ def available_endpoint_services(self): raise NotImplementedError("APIVersion {} is not available".format(api_version)) return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + @property + def available_resource_group_delegations(self): + """Instance depends on the API version: + + * 2018-08-01: :class:`AvailableResourceGroupDelegationsOperations` + """ + api_version = self._get_api_version('available_resource_group_delegations') + if api_version == '2018-08-01': + from .v2018_08_01.operations import AvailableResourceGroupDelegationsOperations as OperationClass + else: + raise NotImplementedError("APIVersion {} is not available".format(api_version)) + return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version))) + @property def azure_firewall_fqdn_tags(self): """Instance depends on the API version: diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py index 364da62abe8..d4f51ded77b 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py @@ -30,6 +30,7 @@ from .public_ip_address_py3 import PublicIPAddress from .ip_configuration_py3 import IPConfiguration from .resource_navigation_link_py3 import ResourceNavigationLink + from .delegation_py3 import Delegation from .subnet_py3 import Subnet from .frontend_ip_configuration_py3 import FrontendIPConfiguration from .virtual_network_tap_py3 import VirtualNetworkTap @@ -72,6 +73,7 @@ from .application_gateway_ssl_predefined_policy_py3 import ApplicationGatewaySslPredefinedPolicy from .resource_py3 import Resource from .tags_object_py3 import TagsObject + from .available_delegation_py3 import AvailableDelegation from .azure_firewall_ip_configuration_py3 import AzureFirewallIPConfiguration from .azure_firewall_rc_action_py3 import AzureFirewallRCAction from .azure_firewall_application_rule_protocol_py3 import AzureFirewallApplicationRuleProtocol @@ -133,15 +135,10 @@ from .effective_network_security_group_list_result_py3 import EffectiveNetworkSecurityGroupListResult from .effective_route_py3 import EffectiveRoute from .effective_route_list_result_py3 import EffectiveRouteListResult - from .ip_configuration_profile_properties_format_py3 import IPConfigurationProfilePropertiesFormat from .ip_configuration_profile_py3 import IPConfigurationProfile - from .container_network_interface_configuration_properties_format_py3 import ContainerNetworkInterfaceConfigurationPropertiesFormat from .container_network_interface_configuration_py3 import ContainerNetworkInterfaceConfiguration - from .container_properties_format_py3 import ContainerPropertiesFormat from .container_py3 import Container - from .container_network_interface_properties_format_py3 import ContainerNetworkInterfacePropertiesFormat from .container_network_interface_py3 import ContainerNetworkInterface - from .network_profile_properties_format_py3 import NetworkProfilePropertiesFormat from .network_profile_py3 import NetworkProfile from .error_response_py3 import ErrorResponse, ErrorResponseException from .network_watcher_py3 import NetworkWatcher @@ -285,6 +282,7 @@ from .public_ip_address import PublicIPAddress from .ip_configuration import IPConfiguration from .resource_navigation_link import ResourceNavigationLink + from .delegation import Delegation from .subnet import Subnet from .frontend_ip_configuration import FrontendIPConfiguration from .virtual_network_tap import VirtualNetworkTap @@ -327,6 +325,7 @@ from .application_gateway_ssl_predefined_policy import ApplicationGatewaySslPredefinedPolicy from .resource import Resource from .tags_object import TagsObject + from .available_delegation import AvailableDelegation from .azure_firewall_ip_configuration import AzureFirewallIPConfiguration from .azure_firewall_rc_action import AzureFirewallRCAction from .azure_firewall_application_rule_protocol import AzureFirewallApplicationRuleProtocol @@ -388,15 +387,10 @@ from .effective_network_security_group_list_result import EffectiveNetworkSecurityGroupListResult from .effective_route import EffectiveRoute from .effective_route_list_result import EffectiveRouteListResult - from .ip_configuration_profile_properties_format import IPConfigurationProfilePropertiesFormat from .ip_configuration_profile import IPConfigurationProfile - from .container_network_interface_configuration_properties_format import ContainerNetworkInterfaceConfigurationPropertiesFormat from .container_network_interface_configuration import ContainerNetworkInterfaceConfiguration - from .container_properties_format import ContainerPropertiesFormat from .container import Container - from .container_network_interface_properties_format import ContainerNetworkInterfacePropertiesFormat from .container_network_interface import ContainerNetworkInterface - from .network_profile_properties_format import NetworkProfilePropertiesFormat from .network_profile import NetworkProfile from .error_response import ErrorResponse, ErrorResponseException from .network_watcher import NetworkWatcher @@ -522,6 +516,7 @@ from .application_gateway_paged import ApplicationGatewayPaged from .application_gateway_ssl_predefined_policy_paged import ApplicationGatewaySslPredefinedPolicyPaged from .application_security_group_paged import ApplicationSecurityGroupPaged +from .available_delegation_paged import AvailableDelegationPaged from .azure_firewall_paged import AzureFirewallPaged from .azure_firewall_fqdn_tag_paged import AzureFirewallFqdnTagPaged from .ddos_protection_plan_paged import DdosProtectionPlanPaged @@ -678,6 +673,7 @@ 'PublicIPAddress', 'IPConfiguration', 'ResourceNavigationLink', + 'Delegation', 'Subnet', 'FrontendIPConfiguration', 'VirtualNetworkTap', @@ -720,6 +716,7 @@ 'ApplicationGatewaySslPredefinedPolicy', 'Resource', 'TagsObject', + 'AvailableDelegation', 'AzureFirewallIPConfiguration', 'AzureFirewallRCAction', 'AzureFirewallApplicationRuleProtocol', @@ -781,15 +778,10 @@ 'EffectiveNetworkSecurityGroupListResult', 'EffectiveRoute', 'EffectiveRouteListResult', - 'IPConfigurationProfilePropertiesFormat', 'IPConfigurationProfile', - 'ContainerNetworkInterfaceConfigurationPropertiesFormat', 'ContainerNetworkInterfaceConfiguration', - 'ContainerPropertiesFormat', 'Container', - 'ContainerNetworkInterfacePropertiesFormat', 'ContainerNetworkInterface', - 'NetworkProfilePropertiesFormat', 'NetworkProfile', 'ErrorResponse', 'ErrorResponseException', 'NetworkWatcher', @@ -915,6 +907,7 @@ 'ApplicationGatewayPaged', 'ApplicationGatewaySslPredefinedPolicyPaged', 'ApplicationSecurityGroupPaged', + 'AvailableDelegationPaged', 'AzureFirewallPaged', 'AzureFirewallFqdnTagPaged', 'DdosProtectionPlanPaged', diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/available_delegation.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/available_delegation.py new file mode 100644 index 00000000000..71c61ffa962 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/available_delegation.py @@ -0,0 +1,46 @@ +# 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 AvailableDelegation(Model): + """The serviceName of an AvailableDelegation indicates a possible delegation + for a subnet. + + :param name: The name of the AvailableDelegation resource. + :type name: str + :param id: A unique identifier of the AvailableDelegation resource. + :type id: str + :param type: Resource type. + :type type: str + :param service_name: The name of the service and resource + :type service_name: str + :param actions: Describes the actions permitted to the service upon + delegation + :type actions: list[str] + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'id': {'key': 'id', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'service_name': {'key': 'serviceName', 'type': 'str'}, + 'actions': {'key': 'actions', 'type': '[str]'}, + } + + def __init__(self, **kwargs): + super(AvailableDelegation, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.id = kwargs.get('id', None) + self.type = kwargs.get('type', None) + self.service_name = kwargs.get('service_name', None) + self.actions = kwargs.get('actions', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_properties_format.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/available_delegation_paged.py similarity index 52% rename from azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_properties_format.py rename to azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/available_delegation_paged.py index 373e4b51884..dbf7c781788 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_properties_format.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/available_delegation_paged.py @@ -9,20 +9,19 @@ # regenerated. # -------------------------------------------------------------------------- -from msrest.serialization import Model +from msrest.paging import Paged -class ContainerPropertiesFormat(Model): - """Container resource properties. - - :param container_uri: ARM Uri for the container. - :type container_uri: str +class AvailableDelegationPaged(Paged): + """ + A paging container for iterating over a list of :class:`AvailableDelegation ` object """ _attribute_map = { - 'container_uri': {'key': 'containerUri', 'type': 'str'}, + 'next_link': {'key': 'nextLink', 'type': 'str'}, + 'current_page': {'key': 'value', 'type': '[AvailableDelegation]'} } - def __init__(self, **kwargs): - super(ContainerPropertiesFormat, self).__init__(**kwargs) - self.container_uri = kwargs.get('container_uri', None) + def __init__(self, *args, **kwargs): + + super(AvailableDelegationPaged, self).__init__(*args, **kwargs) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/available_delegation_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/available_delegation_py3.py new file mode 100644 index 00000000000..c5e8ae7405b --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/available_delegation_py3.py @@ -0,0 +1,46 @@ +# 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 AvailableDelegation(Model): + """The serviceName of an AvailableDelegation indicates a possible delegation + for a subnet. + + :param name: The name of the AvailableDelegation resource. + :type name: str + :param id: A unique identifier of the AvailableDelegation resource. + :type id: str + :param type: Resource type. + :type type: str + :param service_name: The name of the service and resource + :type service_name: str + :param actions: Describes the actions permitted to the service upon + delegation + :type actions: list[str] + """ + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'id': {'key': 'id', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'service_name': {'key': 'serviceName', 'type': 'str'}, + 'actions': {'key': 'actions', 'type': '[str]'}, + } + + def __init__(self, *, name: str=None, id: str=None, type: str=None, service_name: str=None, actions=None, **kwargs) -> None: + super(AvailableDelegation, self).__init__(**kwargs) + self.name = name + self.id = id + self.type = type + self.service_name = service_name + self.actions = actions diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container.py index 0ffb3f2c7e2..4b67fabf1d4 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container.py @@ -15,20 +15,19 @@ class Container(Model): """Reference to container resource in remote resource provider. - :param properties: Properties of the container. - :type properties: - ~azure.mgmt.network.v2018_08_01.models.ContainerPropertiesFormat + :param container_uri: ARM Uri for the container. + :type container_uri: str :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str """ _attribute_map = { - 'properties': {'key': 'properties', 'type': 'ContainerPropertiesFormat'}, + 'container_uri': {'key': 'properties.containerUri', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } def __init__(self, **kwargs): super(Container, self).__init__(**kwargs) - self.properties = kwargs.get('properties', None) + self.container_uri = kwargs.get('container_uri', None) self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface.py index f7cbaacb748..52146a73bf8 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface.py @@ -17,9 +17,14 @@ class ContainerNetworkInterface(SubResource): :param id: Resource ID. :type id: str - :param properties: Container network interface properties. - :type properties: - ~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfacePropertiesFormat + :param container_network_interface_configuration: Container network + interface configuration from which this container network interface is + created. + :type container_network_interface_configuration: + ~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfaceConfiguration + :param container: Reference to the conatinaer to which this container + network interface is attached. + :type container: ~azure.mgmt.network.v2018_08_01.models.Container :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str @@ -27,11 +32,13 @@ class ContainerNetworkInterface(SubResource): _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, - 'properties': {'key': 'properties', 'type': 'ContainerNetworkInterfacePropertiesFormat'}, + 'container_network_interface_configuration': {'key': 'properties.containerNetworkInterfaceConfiguration', 'type': 'ContainerNetworkInterfaceConfiguration'}, + 'container': {'key': 'properties.container', 'type': 'Container'}, 'etag': {'key': 'etag', 'type': 'str'}, } def __init__(self, **kwargs): super(ContainerNetworkInterface, self).__init__(**kwargs) - self.properties = kwargs.get('properties', None) + self.container_network_interface_configuration = kwargs.get('container_network_interface_configuration', None) + self.container = kwargs.get('container', None) self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration.py index 7dea95b246a..b21ae11e685 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration.py @@ -17,9 +17,14 @@ class ContainerNetworkInterfaceConfiguration(SubResource): :param id: Resource ID. :type id: str - :param properties: Container network interface configuration properties. - :type properties: - ~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfaceConfigurationPropertiesFormat + :param ip_configurations: A list of ip configurations of the container + network interface configuration. + :type ip_configurations: + list[~azure.mgmt.network.v2018_08_01.models.IPConfigurationProfile] + :param container_network_interfaces: A list of container network + interfaces created from this container network interface configuration. + :type container_network_interfaces: + list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterface] :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str @@ -27,11 +32,13 @@ class ContainerNetworkInterfaceConfiguration(SubResource): _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, - 'properties': {'key': 'properties', 'type': 'ContainerNetworkInterfaceConfigurationPropertiesFormat'}, + 'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[IPConfigurationProfile]'}, + 'container_network_interfaces': {'key': 'properties.containerNetworkInterfaces', 'type': '[ContainerNetworkInterface]'}, 'etag': {'key': 'etag', 'type': 'str'}, } def __init__(self, **kwargs): super(ContainerNetworkInterfaceConfiguration, self).__init__(**kwargs) - self.properties = kwargs.get('properties', None) + self.ip_configurations = kwargs.get('ip_configurations', None) + self.container_network_interfaces = kwargs.get('container_network_interfaces', None) self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_properties_format.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_properties_format.py deleted file mode 100644 index 9b4e67e783b..00000000000 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_properties_format.py +++ /dev/null @@ -1,36 +0,0 @@ -# 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 ContainerNetworkInterfaceConfigurationPropertiesFormat(Model): - """Container network interface configuration properties. - - :param ip_configurations: A list of ip configurations of the container - network interface configuration. - :type ip_configurations: - list[~azure.mgmt.network.v2018_08_01.models.IPConfigurationProfile] - :param container_network_interfaces: A list of container network - interfaces created from this container network interface configuration. - :type container_network_interfaces: - list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterface] - """ - - _attribute_map = { - 'ip_configurations': {'key': 'ipConfigurations', 'type': '[IPConfigurationProfile]'}, - 'container_network_interfaces': {'key': 'containerNetworkInterfaces', 'type': '[ContainerNetworkInterface]'}, - } - - def __init__(self, **kwargs): - super(ContainerNetworkInterfaceConfigurationPropertiesFormat, self).__init__(**kwargs) - self.ip_configurations = kwargs.get('ip_configurations', None) - self.container_network_interfaces = kwargs.get('container_network_interfaces', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_properties_format_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_properties_format_py3.py deleted file mode 100644 index a718efaf41d..00000000000 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_properties_format_py3.py +++ /dev/null @@ -1,36 +0,0 @@ -# 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 ContainerNetworkInterfaceConfigurationPropertiesFormat(Model): - """Container network interface configuration properties. - - :param ip_configurations: A list of ip configurations of the container - network interface configuration. - :type ip_configurations: - list[~azure.mgmt.network.v2018_08_01.models.IPConfigurationProfile] - :param container_network_interfaces: A list of container network - interfaces created from this container network interface configuration. - :type container_network_interfaces: - list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterface] - """ - - _attribute_map = { - 'ip_configurations': {'key': 'ipConfigurations', 'type': '[IPConfigurationProfile]'}, - 'container_network_interfaces': {'key': 'containerNetworkInterfaces', 'type': '[ContainerNetworkInterface]'}, - } - - def __init__(self, *, ip_configurations=None, container_network_interfaces=None, **kwargs) -> None: - super(ContainerNetworkInterfaceConfigurationPropertiesFormat, self).__init__(**kwargs) - self.ip_configurations = ip_configurations - self.container_network_interfaces = container_network_interfaces diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_py3.py index 674949ba7df..11f65bbdbe3 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_py3.py @@ -17,9 +17,14 @@ class ContainerNetworkInterfaceConfiguration(SubResource): :param id: Resource ID. :type id: str - :param properties: Container network interface configuration properties. - :type properties: - ~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfaceConfigurationPropertiesFormat + :param ip_configurations: A list of ip configurations of the container + network interface configuration. + :type ip_configurations: + list[~azure.mgmt.network.v2018_08_01.models.IPConfigurationProfile] + :param container_network_interfaces: A list of container network + interfaces created from this container network interface configuration. + :type container_network_interfaces: + list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterface] :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str @@ -27,11 +32,13 @@ class ContainerNetworkInterfaceConfiguration(SubResource): _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, - 'properties': {'key': 'properties', 'type': 'ContainerNetworkInterfaceConfigurationPropertiesFormat'}, + 'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[IPConfigurationProfile]'}, + 'container_network_interfaces': {'key': 'properties.containerNetworkInterfaces', 'type': '[ContainerNetworkInterface]'}, 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, properties=None, etag: str=None, **kwargs) -> None: + def __init__(self, *, id: str=None, ip_configurations=None, container_network_interfaces=None, etag: str=None, **kwargs) -> None: super(ContainerNetworkInterfaceConfiguration, self).__init__(id=id, **kwargs) - self.properties = properties + self.ip_configurations = ip_configurations + self.container_network_interfaces = container_network_interfaces self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_properties_format.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_properties_format.py deleted file mode 100644 index 6f317bc6761..00000000000 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_properties_format.py +++ /dev/null @@ -1,36 +0,0 @@ -# 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 ContainerNetworkInterfacePropertiesFormat(Model): - """ContainerNetworkInterfacePropertiesFormat. - - :param container_network_interface_configuration: Container network - interface configuration from which this container network interface is - created. - :type container_network_interface_configuration: - ~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfaceConfiguration - :param container: Reference to the conatinaer to which this container - network interface is attached. - :type container: ~azure.mgmt.network.v2018_08_01.models.Container - """ - - _attribute_map = { - 'container_network_interface_configuration': {'key': 'containerNetworkInterfaceConfiguration', 'type': 'ContainerNetworkInterfaceConfiguration'}, - 'container': {'key': 'container', 'type': 'Container'}, - } - - def __init__(self, **kwargs): - super(ContainerNetworkInterfacePropertiesFormat, self).__init__(**kwargs) - self.container_network_interface_configuration = kwargs.get('container_network_interface_configuration', None) - self.container = kwargs.get('container', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_properties_format_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_properties_format_py3.py deleted file mode 100644 index fdd833e5991..00000000000 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_properties_format_py3.py +++ /dev/null @@ -1,36 +0,0 @@ -# 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 ContainerNetworkInterfacePropertiesFormat(Model): - """ContainerNetworkInterfacePropertiesFormat. - - :param container_network_interface_configuration: Container network - interface configuration from which this container network interface is - created. - :type container_network_interface_configuration: - ~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfaceConfiguration - :param container: Reference to the conatinaer to which this container - network interface is attached. - :type container: ~azure.mgmt.network.v2018_08_01.models.Container - """ - - _attribute_map = { - 'container_network_interface_configuration': {'key': 'containerNetworkInterfaceConfiguration', 'type': 'ContainerNetworkInterfaceConfiguration'}, - 'container': {'key': 'container', 'type': 'Container'}, - } - - def __init__(self, *, container_network_interface_configuration=None, container=None, **kwargs) -> None: - super(ContainerNetworkInterfacePropertiesFormat, self).__init__(**kwargs) - self.container_network_interface_configuration = container_network_interface_configuration - self.container = container diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_py3.py index 3055e1fca04..9ecbaf27d74 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_py3.py @@ -17,9 +17,14 @@ class ContainerNetworkInterface(SubResource): :param id: Resource ID. :type id: str - :param properties: Container network interface properties. - :type properties: - ~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfacePropertiesFormat + :param container_network_interface_configuration: Container network + interface configuration from which this container network interface is + created. + :type container_network_interface_configuration: + ~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfaceConfiguration + :param container: Reference to the conatinaer to which this container + network interface is attached. + :type container: ~azure.mgmt.network.v2018_08_01.models.Container :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str @@ -27,11 +32,13 @@ class ContainerNetworkInterface(SubResource): _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, - 'properties': {'key': 'properties', 'type': 'ContainerNetworkInterfacePropertiesFormat'}, + 'container_network_interface_configuration': {'key': 'properties.containerNetworkInterfaceConfiguration', 'type': 'ContainerNetworkInterfaceConfiguration'}, + 'container': {'key': 'properties.container', 'type': 'Container'}, 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, properties=None, etag: str=None, **kwargs) -> None: + def __init__(self, *, id: str=None, container_network_interface_configuration=None, container=None, etag: str=None, **kwargs) -> None: super(ContainerNetworkInterface, self).__init__(id=id, **kwargs) - self.properties = properties + self.container_network_interface_configuration = container_network_interface_configuration + self.container = container self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_properties_format_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_properties_format_py3.py deleted file mode 100644 index 1f0f9efc4a7..00000000000 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_properties_format_py3.py +++ /dev/null @@ -1,28 +0,0 @@ -# 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 ContainerPropertiesFormat(Model): - """Container resource properties. - - :param container_uri: ARM Uri for the container. - :type container_uri: str - """ - - _attribute_map = { - 'container_uri': {'key': 'containerUri', 'type': 'str'}, - } - - def __init__(self, *, container_uri: str=None, **kwargs) -> None: - super(ContainerPropertiesFormat, self).__init__(**kwargs) - self.container_uri = container_uri diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_py3.py index 234ad2975ec..5614fda898d 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_py3.py @@ -15,20 +15,19 @@ class Container(Model): """Reference to container resource in remote resource provider. - :param properties: Properties of the container. - :type properties: - ~azure.mgmt.network.v2018_08_01.models.ContainerPropertiesFormat + :param container_uri: ARM Uri for the container. + :type container_uri: str :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str """ _attribute_map = { - 'properties': {'key': 'properties', 'type': 'ContainerPropertiesFormat'}, + 'container_uri': {'key': 'properties.containerUri', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, properties=None, etag: str=None, **kwargs) -> None: + def __init__(self, *, container_uri: str=None, etag: str=None, **kwargs) -> None: super(Container, self).__init__(**kwargs) - self.properties = properties + self.container_uri = container_uri self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/delegation.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/delegation.py new file mode 100644 index 00000000000..b9db5da4add --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/delegation.py @@ -0,0 +1,58 @@ +# 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 .sub_resource import SubResource + + +class Delegation(SubResource): + """Details the service to which the subnet is delegated. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param id: Resource ID. + :type id: str + :param service_name: The name of the service to whom the subnet should be + delegated (e.g. Microsoft.Sql/servers) + :type service_name: str + :param actions: Describes the actions permitted to the service upon + delegation + :type actions: list[str] + :ivar provisioning_state: The provisioning state of the resource. + :vartype provisioning_state: str + :param name: The name of the resource that is unique within a subnet. This + name can be used to access the resource. + :type name: str + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _validation = { + 'provisioning_state': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'service_name': {'key': 'properties.serviceName', 'type': 'str'}, + 'actions': {'key': 'properties.actions', 'type': '[str]'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(Delegation, self).__init__(**kwargs) + self.service_name = kwargs.get('service_name', None) + self.actions = kwargs.get('actions', None) + self.provisioning_state = None + self.name = kwargs.get('name', None) + self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/delegation_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/delegation_py3.py new file mode 100644 index 00000000000..d374f9d4828 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/delegation_py3.py @@ -0,0 +1,58 @@ +# 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 .sub_resource_py3 import SubResource + + +class Delegation(SubResource): + """Details the service to which the subnet is delegated. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :param id: Resource ID. + :type id: str + :param service_name: The name of the service to whom the subnet should be + delegated (e.g. Microsoft.Sql/servers) + :type service_name: str + :param actions: Describes the actions permitted to the service upon + delegation + :type actions: list[str] + :ivar provisioning_state: The provisioning state of the resource. + :vartype provisioning_state: str + :param name: The name of the resource that is unique within a subnet. This + name can be used to access the resource. + :type name: str + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _validation = { + 'provisioning_state': {'readonly': True}, + } + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + 'service_name': {'key': 'properties.serviceName', 'type': 'str'}, + 'actions': {'key': 'properties.actions', 'type': '[str]'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, *, id: str=None, service_name: str=None, actions=None, name: str=None, etag: str=None, **kwargs) -> None: + super(Delegation, self).__init__(id=id, **kwargs) + self.service_name = service_name + self.actions = actions + self.provisioning_state = None + self.name = name + self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile.py index 663c33b70ed..08469c67093 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile.py @@ -17,9 +17,9 @@ class IPConfigurationProfile(SubResource): :param id: Resource ID. :type id: str - :param properties: Properties of the IP configuration profile. - :type properties: - ~azure.mgmt.network.v2018_08_01.models.IPConfigurationProfilePropertiesFormat + :param subnet: The reference of the subnet resource to create a + contatainer network interface ip configruation. + :type subnet: ~azure.mgmt.network.v2018_08_01.models.Subnet :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str @@ -27,11 +27,11 @@ class IPConfigurationProfile(SubResource): _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, - 'properties': {'key': 'properties', 'type': 'IPConfigurationProfilePropertiesFormat'}, + 'subnet': {'key': 'properties.subnet', 'type': 'Subnet'}, 'etag': {'key': 'etag', 'type': 'str'}, } def __init__(self, **kwargs): super(IPConfigurationProfile, self).__init__(**kwargs) - self.properties = kwargs.get('properties', None) + self.subnet = kwargs.get('subnet', None) self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_properties_format.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_properties_format.py deleted file mode 100644 index 0177cb2e19a..00000000000 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_properties_format.py +++ /dev/null @@ -1,29 +0,0 @@ -# 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 IPConfigurationProfilePropertiesFormat(Model): - """IP configruation profile properties. - - :param subnet: The reference of the subnet resource to create a - contatainer network interface ip configruation. - :type subnet: ~azure.mgmt.network.v2018_08_01.models.Subnet - """ - - _attribute_map = { - 'subnet': {'key': 'subnet', 'type': 'Subnet'}, - } - - def __init__(self, **kwargs): - super(IPConfigurationProfilePropertiesFormat, self).__init__(**kwargs) - self.subnet = kwargs.get('subnet', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_properties_format_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_properties_format_py3.py deleted file mode 100644 index 985fa07ea6c..00000000000 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_properties_format_py3.py +++ /dev/null @@ -1,29 +0,0 @@ -# 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 IPConfigurationProfilePropertiesFormat(Model): - """IP configruation profile properties. - - :param subnet: The reference of the subnet resource to create a - contatainer network interface ip configruation. - :type subnet: ~azure.mgmt.network.v2018_08_01.models.Subnet - """ - - _attribute_map = { - 'subnet': {'key': 'subnet', 'type': 'Subnet'}, - } - - def __init__(self, *, subnet=None, **kwargs) -> None: - super(IPConfigurationProfilePropertiesFormat, self).__init__(**kwargs) - self.subnet = subnet diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_py3.py index f1126e1a23f..c5640960ea3 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_py3.py @@ -17,9 +17,9 @@ class IPConfigurationProfile(SubResource): :param id: Resource ID. :type id: str - :param properties: Properties of the IP configuration profile. - :type properties: - ~azure.mgmt.network.v2018_08_01.models.IPConfigurationProfilePropertiesFormat + :param subnet: The reference of the subnet resource to create a + contatainer network interface ip configruation. + :type subnet: ~azure.mgmt.network.v2018_08_01.models.Subnet :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str @@ -27,11 +27,11 @@ class IPConfigurationProfile(SubResource): _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, - 'properties': {'key': 'properties', 'type': 'IPConfigurationProfilePropertiesFormat'}, + 'subnet': {'key': 'properties.subnet', 'type': 'Subnet'}, 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, properties=None, etag: str=None, **kwargs) -> None: + def __init__(self, *, id: str=None, subnet=None, etag: str=None, **kwargs) -> None: super(IPConfigurationProfile, self).__init__(id=id, **kwargs) - self.properties = properties + self.subnet = subnet self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile.py index db823dc2698..904e5dab98a 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile.py @@ -28,9 +28,14 @@ class NetworkProfile(Resource): :type location: str :param tags: Resource tags. :type tags: dict[str, str] - :param properties: Network profile properties. - :type properties: - ~azure.mgmt.network.v2018_08_01.models.NetworkProfilePropertiesFormat + :param container_network_interfaces: List of child container network + interfaces. + :type container_network_interfaces: + list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterface] + :param container_network_interface_configurations: List of chid container + network interface configurations. + :type container_network_interface_configurations: + list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfaceConfiguration] :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str @@ -47,11 +52,13 @@ class NetworkProfile(Resource): 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, - 'properties': {'key': 'properties', 'type': 'NetworkProfilePropertiesFormat'}, + 'container_network_interfaces': {'key': 'properties.containerNetworkInterfaces', 'type': '[ContainerNetworkInterface]'}, + 'container_network_interface_configurations': {'key': 'properties.containerNetworkInterfaceConfigurations', 'type': '[ContainerNetworkInterfaceConfiguration]'}, 'etag': {'key': 'etag', 'type': 'str'}, } def __init__(self, **kwargs): super(NetworkProfile, self).__init__(**kwargs) - self.properties = kwargs.get('properties', None) + self.container_network_interfaces = kwargs.get('container_network_interfaces', None) + self.container_network_interface_configurations = kwargs.get('container_network_interface_configurations', None) self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_properties_format.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_properties_format.py deleted file mode 100644 index 0f6a5b1d779..00000000000 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_properties_format.py +++ /dev/null @@ -1,36 +0,0 @@ -# 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 NetworkProfilePropertiesFormat(Model): - """Network profile properties. - - :param container_network_interfaces: List of child container network - interfaces. - :type container_network_interfaces: - list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterface] - :param container_network_interface_configurations: List of chid container - network interface configurations. - :type container_network_interface_configurations: - list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfaceConfiguration] - """ - - _attribute_map = { - 'container_network_interfaces': {'key': 'containerNetworkInterfaces', 'type': '[ContainerNetworkInterface]'}, - 'container_network_interface_configurations': {'key': 'containerNetworkInterfaceConfigurations', 'type': '[ContainerNetworkInterfaceConfiguration]'}, - } - - def __init__(self, **kwargs): - super(NetworkProfilePropertiesFormat, self).__init__(**kwargs) - self.container_network_interfaces = kwargs.get('container_network_interfaces', None) - self.container_network_interface_configurations = kwargs.get('container_network_interface_configurations', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_properties_format_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_properties_format_py3.py deleted file mode 100644 index 379ee8b7df0..00000000000 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_properties_format_py3.py +++ /dev/null @@ -1,36 +0,0 @@ -# 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 NetworkProfilePropertiesFormat(Model): - """Network profile properties. - - :param container_network_interfaces: List of child container network - interfaces. - :type container_network_interfaces: - list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterface] - :param container_network_interface_configurations: List of chid container - network interface configurations. - :type container_network_interface_configurations: - list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfaceConfiguration] - """ - - _attribute_map = { - 'container_network_interfaces': {'key': 'containerNetworkInterfaces', 'type': '[ContainerNetworkInterface]'}, - 'container_network_interface_configurations': {'key': 'containerNetworkInterfaceConfigurations', 'type': '[ContainerNetworkInterfaceConfiguration]'}, - } - - def __init__(self, *, container_network_interfaces=None, container_network_interface_configurations=None, **kwargs) -> None: - super(NetworkProfilePropertiesFormat, self).__init__(**kwargs) - self.container_network_interfaces = container_network_interfaces - self.container_network_interface_configurations = container_network_interface_configurations diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_py3.py index 183609a4a78..09b11e85e8b 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_py3.py @@ -28,9 +28,14 @@ class NetworkProfile(Resource): :type location: str :param tags: Resource tags. :type tags: dict[str, str] - :param properties: Network profile properties. - :type properties: - ~azure.mgmt.network.v2018_08_01.models.NetworkProfilePropertiesFormat + :param container_network_interfaces: List of child container network + interfaces. + :type container_network_interfaces: + list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterface] + :param container_network_interface_configurations: List of chid container + network interface configurations. + :type container_network_interface_configurations: + list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfaceConfiguration] :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str @@ -47,11 +52,13 @@ class NetworkProfile(Resource): 'type': {'key': 'type', 'type': 'str'}, 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, - 'properties': {'key': 'properties', 'type': 'NetworkProfilePropertiesFormat'}, + 'container_network_interfaces': {'key': 'properties.containerNetworkInterfaces', 'type': '[ContainerNetworkInterface]'}, + 'container_network_interface_configurations': {'key': 'properties.containerNetworkInterfaceConfigurations', 'type': '[ContainerNetworkInterfaceConfiguration]'}, 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, location: str=None, tags=None, properties=None, etag: str=None, **kwargs) -> None: + def __init__(self, *, id: str=None, location: str=None, tags=None, container_network_interfaces=None, container_network_interface_configurations=None, etag: str=None, **kwargs) -> None: super(NetworkProfile, self).__init__(id=id, location=location, tags=tags, **kwargs) - self.properties = properties + self.container_network_interfaces = container_network_interfaces + self.container_network_interface_configurations = container_network_interface_configurations self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/subnet.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/subnet.py index 53982cdfdde..28f43095335 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/subnet.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/subnet.py @@ -47,6 +47,12 @@ class Subnet(SubResource): external resources using subnet. :type resource_navigation_links: list[~azure.mgmt.network.v2018_08_01.models.ResourceNavigationLink] + :param delegations: Gets an array of references to the delegations on the + subnet. + :type delegations: list[~azure.mgmt.network.v2018_08_01.models.Delegation] + :ivar purpose: A read-only string identifying the intention of use for + this subnet based on delegations and other user-defined properties. + :vartype purpose: str :param provisioning_state: The provisioning state of the resource. :type provisioning_state: str :param name: The name of the resource that is unique within a resource @@ -59,6 +65,7 @@ class Subnet(SubResource): _validation = { 'ip_configurations': {'readonly': True}, + 'purpose': {'readonly': True}, } _attribute_map = { @@ -72,6 +79,8 @@ class Subnet(SubResource): 'interface_endpoints': {'key': 'properties.interfaceEndpoints', 'type': '[SubResource]'}, 'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[IPConfiguration]'}, 'resource_navigation_links': {'key': 'properties.resourceNavigationLinks', 'type': '[ResourceNavigationLink]'}, + 'delegations': {'key': 'properties.delegations', 'type': '[Delegation]'}, + 'purpose': {'key': 'properties.purpose', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, @@ -88,6 +97,8 @@ def __init__(self, **kwargs): self.interface_endpoints = kwargs.get('interface_endpoints', None) self.ip_configurations = None self.resource_navigation_links = kwargs.get('resource_navigation_links', None) + self.delegations = kwargs.get('delegations', None) + self.purpose = None self.provisioning_state = kwargs.get('provisioning_state', None) self.name = kwargs.get('name', None) self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/subnet_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/subnet_py3.py index cb04284ba32..4b031287a02 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/subnet_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/subnet_py3.py @@ -47,6 +47,12 @@ class Subnet(SubResource): external resources using subnet. :type resource_navigation_links: list[~azure.mgmt.network.v2018_08_01.models.ResourceNavigationLink] + :param delegations: Gets an array of references to the delegations on the + subnet. + :type delegations: list[~azure.mgmt.network.v2018_08_01.models.Delegation] + :ivar purpose: A read-only string identifying the intention of use for + this subnet based on delegations and other user-defined properties. + :vartype purpose: str :param provisioning_state: The provisioning state of the resource. :type provisioning_state: str :param name: The name of the resource that is unique within a resource @@ -59,6 +65,7 @@ class Subnet(SubResource): _validation = { 'ip_configurations': {'readonly': True}, + 'purpose': {'readonly': True}, } _attribute_map = { @@ -72,12 +79,14 @@ class Subnet(SubResource): 'interface_endpoints': {'key': 'properties.interfaceEndpoints', 'type': '[SubResource]'}, 'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[IPConfiguration]'}, 'resource_navigation_links': {'key': 'properties.resourceNavigationLinks', 'type': '[ResourceNavigationLink]'}, + 'delegations': {'key': 'properties.delegations', 'type': '[Delegation]'}, + 'purpose': {'key': 'properties.purpose', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'name': {'key': 'name', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, address_prefix: str=None, address_prefixes=None, network_security_group=None, route_table=None, service_endpoints=None, service_endpoint_policies=None, interface_endpoints=None, resource_navigation_links=None, provisioning_state: str=None, name: str=None, etag: str=None, **kwargs) -> None: + def __init__(self, *, id: str=None, address_prefix: str=None, address_prefixes=None, network_security_group=None, route_table=None, service_endpoints=None, service_endpoint_policies=None, interface_endpoints=None, resource_navigation_links=None, delegations=None, provisioning_state: str=None, name: str=None, etag: str=None, **kwargs) -> None: super(Subnet, self).__init__(id=id, **kwargs) self.address_prefix = address_prefix self.address_prefixes = address_prefixes @@ -88,6 +97,8 @@ def __init__(self, *, id: str=None, address_prefix: str=None, address_prefixes=N self.interface_endpoints = interface_endpoints self.ip_configurations = None self.resource_navigation_links = resource_navigation_links + self.delegations = delegations + self.purpose = None self.provisioning_state = provisioning_state self.name = name self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/network_management_client.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/network_management_client.py index 70834be8ac6..a95d19ca02c 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/network_management_client.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/network_management_client.py @@ -20,6 +20,8 @@ import uuid from .operations.application_gateways_operations import ApplicationGatewaysOperations from .operations.application_security_groups_operations import ApplicationSecurityGroupsOperations +from .operations.available_delegations_operations import AvailableDelegationsOperations +from .operations.available_resource_group_delegations_operations import AvailableResourceGroupDelegationsOperations from .operations.azure_firewalls_operations import AzureFirewallsOperations from .operations.azure_firewall_fqdn_tags_operations import AzureFirewallFqdnTagsOperations from .operations.ddos_protection_plans_operations import DdosProtectionPlansOperations @@ -124,6 +126,10 @@ class NetworkManagementClient(SDKClient): :vartype application_gateways: azure.mgmt.network.v2018_08_01.operations.ApplicationGatewaysOperations :ivar application_security_groups: ApplicationSecurityGroups operations :vartype application_security_groups: azure.mgmt.network.v2018_08_01.operations.ApplicationSecurityGroupsOperations + :ivar available_delegations: AvailableDelegations operations + :vartype available_delegations: azure.mgmt.network.v2018_08_01.operations.AvailableDelegationsOperations + :ivar available_resource_group_delegations: AvailableResourceGroupDelegations operations + :vartype available_resource_group_delegations: azure.mgmt.network.v2018_08_01.operations.AvailableResourceGroupDelegationsOperations :ivar azure_firewalls: AzureFirewalls operations :vartype azure_firewalls: azure.mgmt.network.v2018_08_01.operations.AzureFirewallsOperations :ivar azure_firewall_fqdn_tags: AzureFirewallFqdnTags operations @@ -263,6 +269,10 @@ def __init__( self._client, self.config, self._serialize, self._deserialize) self.application_security_groups = ApplicationSecurityGroupsOperations( self._client, self.config, self._serialize, self._deserialize) + self.available_delegations = AvailableDelegationsOperations( + self._client, self.config, self._serialize, self._deserialize) + self.available_resource_group_delegations = AvailableResourceGroupDelegationsOperations( + self._client, self.config, self._serialize, self._deserialize) self.azure_firewalls = AzureFirewallsOperations( self._client, self.config, self._serialize, self._deserialize) self.azure_firewall_fqdn_tags = AzureFirewallFqdnTagsOperations( diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/__init__.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/__init__.py index 43184da097b..8c6751fce9f 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/__init__.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/__init__.py @@ -11,6 +11,8 @@ from .application_gateways_operations import ApplicationGatewaysOperations from .application_security_groups_operations import ApplicationSecurityGroupsOperations +from .available_delegations_operations import AvailableDelegationsOperations +from .available_resource_group_delegations_operations import AvailableResourceGroupDelegationsOperations from .azure_firewalls_operations import AzureFirewallsOperations from .azure_firewall_fqdn_tags_operations import AzureFirewallFqdnTagsOperations from .ddos_protection_plans_operations import DdosProtectionPlansOperations @@ -72,6 +74,8 @@ __all__ = [ 'ApplicationGatewaysOperations', 'ApplicationSecurityGroupsOperations', + 'AvailableDelegationsOperations', + 'AvailableResourceGroupDelegationsOperations', 'AzureFirewallsOperations', 'AzureFirewallFqdnTagsOperations', 'DdosProtectionPlansOperations', diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/available_delegations_operations.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/available_delegations_operations.py new file mode 100644 index 00000000000..157ae9cc950 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/available_delegations_operations.py @@ -0,0 +1,106 @@ +# 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. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError + +from .. import models + + +class AvailableDelegationsOperations(object): + """AvailableDelegationsOperations operations. + + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + :ivar api_version: Client API version. Constant value: "2018-08-01". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2018-08-01" + + self.config = config + + def list( + self, location, custom_headers=None, raw=False, **operation_config): + """Gets all of the available subnet delegations for this subscription in + this region. + + :param location: The location of the subnet. + :type location: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: An iterator like instance of AvailableDelegation + :rtype: + ~azure.mgmt.network.v2018_08_01.models.AvailableDelegationPaged[~azure.mgmt.network.v2018_08_01.models.AvailableDelegation] + :raises: :class:`CloudError` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list.metadata['url'] + path_format_arguments = { + 'location': self._serialize.url("location", location, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + return response + + # Deserialize response + deserialized = models.AvailableDelegationPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.AvailableDelegationPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Network/locations/{location}/availableDelegations'} diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/available_resource_group_delegations_operations.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/available_resource_group_delegations_operations.py new file mode 100644 index 00000000000..2b42c17a6d3 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/operations/available_resource_group_delegations_operations.py @@ -0,0 +1,109 @@ +# 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. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError + +from .. import models + + +class AvailableResourceGroupDelegationsOperations(object): + """AvailableResourceGroupDelegationsOperations operations. + + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + :ivar api_version: Client API version. Constant value: "2018-08-01". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2018-08-01" + + self.config = config + + def list( + self, location, resource_group_name, custom_headers=None, raw=False, **operation_config): + """Gets all of the available subnet delegations for this resource group in + this region. + + :param location: The location of the domain name. + :type location: str + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: An iterator like instance of AvailableDelegation + :rtype: + ~azure.mgmt.network.v2018_08_01.models.AvailableDelegationPaged[~azure.mgmt.network.v2018_08_01.models.AvailableDelegation] + :raises: :class:`CloudError` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list.metadata['url'] + path_format_arguments = { + 'location': self._serialize.url("location", location, 'str'), + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Accept'] = 'application/json' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters, header_parameters) + response = self._client.send(request, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + return response + + # Deserialize response + deserialized = models.AvailableDelegationPaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.AvailableDelegationPaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/locations/{location}/availableDelegations'} From 418a8374800c05225afbaea07423966d8a7e8540 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Thu, 6 Sep 2018 22:42:29 +0000 Subject: [PATCH 3/4] Generated from e9dafc73a0af94e5717d1886999db8e56aa9683b appease travis by fixing model + examples --- .../network/v2018_08_01/models/__init__.py | 9 ++++ .../models/azure_firewall_application_rule.py | 8 +-- .../azure_firewall_application_rule_py3.py | 10 ++-- .../network/v2018_08_01/models/container.py | 16 ++---- .../models/container_network_interface.py | 27 ++++++++++ ...ntainer_network_interface_configuration.py | 21 ++++++++ ...ner_network_interface_configuration_py3.py | 23 ++++++++- ...iner_network_interface_ip_configuration.py | 50 +++++++++++++++++++ ..._network_interface_ip_configuration_py3.py | 50 +++++++++++++++++++ .../models/container_network_interface_py3.py | 29 ++++++++++- .../v2018_08_01/models/container_py3.py | 20 +++----- .../express_route_circuit_peering_id.py | 28 +++++++++++ .../express_route_circuit_peering_id_py3.py | 28 +++++++++++ .../models/express_route_connection.py | 10 ++-- .../models/express_route_connection_py3.py | 12 +++-- .../models/express_route_gateway.py | 15 +++--- .../models/express_route_gateway_py3.py | 17 ++++--- .../models/ip_configuration_profile.py | 21 ++++++++ .../models/ip_configuration_profile_py3.py | 23 ++++++++- .../v2018_08_01/models/network_profile.py | 11 ++++ .../v2018_08_01/models/network_profile_py3.py | 11 ++++ .../v2018_08_01/models/virtual_hub_id.py | 30 +++++++++++ .../v2018_08_01/models/virtual_hub_id_py3.py | 30 +++++++++++ 23 files changed, 439 insertions(+), 60 deletions(-) create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_ip_configuration.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_ip_configuration_py3.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_peering_id.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_peering_id_py3.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_id.py create mode 100644 azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_id_py3.py diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py index d4f51ded77b..8c576e48e4b 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/__init__.py @@ -114,6 +114,8 @@ from .express_route_circuit_reference_py3 import ExpressRouteCircuitReference from .express_route_cross_connection_peering_py3 import ExpressRouteCrossConnectionPeering from .express_route_cross_connection_py3 import ExpressRouteCrossConnection + from .virtual_hub_id_py3 import VirtualHubId + from .express_route_circuit_peering_id_py3 import ExpressRouteCircuitPeeringId from .express_route_gateway_properties_auto_scale_configuration_bounds_py3 import ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds from .express_route_gateway_properties_auto_scale_configuration_py3 import ExpressRouteGatewayPropertiesAutoScaleConfiguration from .express_route_connection_py3 import ExpressRouteConnection @@ -138,6 +140,7 @@ from .ip_configuration_profile_py3 import IPConfigurationProfile from .container_network_interface_configuration_py3 import ContainerNetworkInterfaceConfiguration from .container_py3 import Container + from .container_network_interface_ip_configuration_py3 import ContainerNetworkInterfaceIpConfiguration from .container_network_interface_py3 import ContainerNetworkInterface from .network_profile_py3 import NetworkProfile from .error_response_py3 import ErrorResponse, ErrorResponseException @@ -366,6 +369,8 @@ from .express_route_circuit_reference import ExpressRouteCircuitReference from .express_route_cross_connection_peering import ExpressRouteCrossConnectionPeering from .express_route_cross_connection import ExpressRouteCrossConnection + from .virtual_hub_id import VirtualHubId + from .express_route_circuit_peering_id import ExpressRouteCircuitPeeringId from .express_route_gateway_properties_auto_scale_configuration_bounds import ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds from .express_route_gateway_properties_auto_scale_configuration import ExpressRouteGatewayPropertiesAutoScaleConfiguration from .express_route_connection import ExpressRouteConnection @@ -390,6 +395,7 @@ from .ip_configuration_profile import IPConfigurationProfile from .container_network_interface_configuration import ContainerNetworkInterfaceConfiguration from .container import Container + from .container_network_interface_ip_configuration import ContainerNetworkInterfaceIpConfiguration from .container_network_interface import ContainerNetworkInterface from .network_profile import NetworkProfile from .error_response import ErrorResponse, ErrorResponseException @@ -757,6 +763,8 @@ 'ExpressRouteCircuitReference', 'ExpressRouteCrossConnectionPeering', 'ExpressRouteCrossConnection', + 'VirtualHubId', + 'ExpressRouteCircuitPeeringId', 'ExpressRouteGatewayPropertiesAutoScaleConfigurationBounds', 'ExpressRouteGatewayPropertiesAutoScaleConfiguration', 'ExpressRouteConnection', @@ -781,6 +789,7 @@ 'IPConfigurationProfile', 'ContainerNetworkInterfaceConfiguration', 'Container', + 'ContainerNetworkInterfaceIpConfiguration', 'ContainerNetworkInterface', 'NetworkProfile', 'ErrorResponse', 'ErrorResponseException', diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/azure_firewall_application_rule.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/azure_firewall_application_rule.py index 728007d6cb9..fde1a159d7c 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/azure_firewall_application_rule.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/azure_firewall_application_rule.py @@ -24,8 +24,8 @@ class AzureFirewallApplicationRule(Model): :param protocols: Array of ApplicationRuleProtocols. :type protocols: list[~azure.mgmt.network.v2018_08_01.models.AzureFirewallApplicationRuleProtocol] - :param target_urls: List of URLs for this rule. - :type target_urls: list[str] + :param target_fqdns: List of FQDNs for this rule. + :type target_fqdns: list[str] :param fqdn_tags: List of FQDN Tags for this rule. :type fqdn_tags: list[str] """ @@ -35,7 +35,7 @@ class AzureFirewallApplicationRule(Model): 'description': {'key': 'description', 'type': 'str'}, 'source_addresses': {'key': 'sourceAddresses', 'type': '[str]'}, 'protocols': {'key': 'protocols', 'type': '[AzureFirewallApplicationRuleProtocol]'}, - 'target_urls': {'key': 'targetUrls', 'type': '[str]'}, + 'target_fqdns': {'key': 'targetFqdns', 'type': '[str]'}, 'fqdn_tags': {'key': 'fqdnTags', 'type': '[str]'}, } @@ -45,5 +45,5 @@ def __init__(self, **kwargs): self.description = kwargs.get('description', None) self.source_addresses = kwargs.get('source_addresses', None) self.protocols = kwargs.get('protocols', None) - self.target_urls = kwargs.get('target_urls', None) + self.target_fqdns = kwargs.get('target_fqdns', None) self.fqdn_tags = kwargs.get('fqdn_tags', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/azure_firewall_application_rule_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/azure_firewall_application_rule_py3.py index ec1b33954df..8fb0e1b8ec3 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/azure_firewall_application_rule_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/azure_firewall_application_rule_py3.py @@ -24,8 +24,8 @@ class AzureFirewallApplicationRule(Model): :param protocols: Array of ApplicationRuleProtocols. :type protocols: list[~azure.mgmt.network.v2018_08_01.models.AzureFirewallApplicationRuleProtocol] - :param target_urls: List of URLs for this rule. - :type target_urls: list[str] + :param target_fqdns: List of FQDNs for this rule. + :type target_fqdns: list[str] :param fqdn_tags: List of FQDN Tags for this rule. :type fqdn_tags: list[str] """ @@ -35,15 +35,15 @@ class AzureFirewallApplicationRule(Model): 'description': {'key': 'description', 'type': 'str'}, 'source_addresses': {'key': 'sourceAddresses', 'type': '[str]'}, 'protocols': {'key': 'protocols', 'type': '[AzureFirewallApplicationRuleProtocol]'}, - 'target_urls': {'key': 'targetUrls', 'type': '[str]'}, + 'target_fqdns': {'key': 'targetFqdns', 'type': '[str]'}, 'fqdn_tags': {'key': 'fqdnTags', 'type': '[str]'}, } - def __init__(self, *, name: str=None, description: str=None, source_addresses=None, protocols=None, target_urls=None, fqdn_tags=None, **kwargs) -> None: + def __init__(self, *, name: str=None, description: str=None, source_addresses=None, protocols=None, target_fqdns=None, fqdn_tags=None, **kwargs) -> None: super(AzureFirewallApplicationRule, self).__init__(**kwargs) self.name = name self.description = description self.source_addresses = source_addresses self.protocols = protocols - self.target_urls = target_urls + self.target_fqdns = target_fqdns self.fqdn_tags = fqdn_tags diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container.py index 4b67fabf1d4..4fa66f10688 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container.py @@ -9,25 +9,19 @@ # regenerated. # -------------------------------------------------------------------------- -from msrest.serialization import Model +from .sub_resource import SubResource -class Container(Model): +class Container(SubResource): """Reference to container resource in remote resource provider. - :param container_uri: ARM Uri for the container. - :type container_uri: str - :param etag: A unique read-only string that changes whenever the resource - is updated. - :type etag: str + :param id: Resource ID. + :type id: str """ _attribute_map = { - 'container_uri': {'key': 'properties.containerUri', 'type': 'str'}, - 'etag': {'key': 'etag', 'type': 'str'}, + 'id': {'key': 'id', 'type': 'str'}, } def __init__(self, **kwargs): super(Container, self).__init__(**kwargs) - self.container_uri = kwargs.get('container_uri', None) - self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface.py index 52146a73bf8..1f87ccf4198 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface.py @@ -15,6 +15,9 @@ class ContainerNetworkInterface(SubResource): """Container network interface child resource. + Variables are only populated by the server, and will be ignored when + sending a request. + :param id: Resource ID. :type id: str :param container_network_interface_configuration: Container network @@ -25,15 +28,35 @@ class ContainerNetworkInterface(SubResource): :param container: Reference to the conatinaer to which this container network interface is attached. :type container: ~azure.mgmt.network.v2018_08_01.models.Container + :param ip_configurations: Reference to the ip configuration on this + container nic. + :type ip_configurations: + list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfaceIpConfiguration] + :ivar provisioning_state: The provisioning state of the resource. + :vartype provisioning_state: str + :param name: The name of the resource. This name can be used to access the + resource. + :type name: str + :ivar type: Sub Resource type. + :vartype type: str :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str """ + _validation = { + 'provisioning_state': {'readonly': True}, + 'type': {'readonly': True}, + } + _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, 'container_network_interface_configuration': {'key': 'properties.containerNetworkInterfaceConfiguration', 'type': 'ContainerNetworkInterfaceConfiguration'}, 'container': {'key': 'properties.container', 'type': 'Container'}, + 'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[ContainerNetworkInterfaceIpConfiguration]'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } @@ -41,4 +64,8 @@ def __init__(self, **kwargs): super(ContainerNetworkInterface, self).__init__(**kwargs) self.container_network_interface_configuration = kwargs.get('container_network_interface_configuration', None) self.container = kwargs.get('container', None) + self.ip_configurations = kwargs.get('ip_configurations', None) + self.provisioning_state = None + self.name = kwargs.get('name', None) + self.type = None self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration.py index b21ae11e685..3ec4f493583 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration.py @@ -15,6 +15,9 @@ class ContainerNetworkInterfaceConfiguration(SubResource): """Container network interface configruation child resource. + Variables are only populated by the server, and will be ignored when + sending a request. + :param id: Resource ID. :type id: str :param ip_configurations: A list of ip configurations of the container @@ -25,15 +28,30 @@ class ContainerNetworkInterfaceConfiguration(SubResource): interfaces created from this container network interface configuration. :type container_network_interfaces: list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterface] + :ivar provisioning_state: The provisioning state of the resource. + :vartype provisioning_state: str + :param name: The name of the resource. This name can be used to access the + resource. + :type name: str + :ivar type: Sub Resource type. + :vartype type: str :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str """ + _validation = { + 'provisioning_state': {'readonly': True}, + 'type': {'readonly': True}, + } + _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, 'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[IPConfigurationProfile]'}, 'container_network_interfaces': {'key': 'properties.containerNetworkInterfaces', 'type': '[ContainerNetworkInterface]'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } @@ -41,4 +59,7 @@ def __init__(self, **kwargs): super(ContainerNetworkInterfaceConfiguration, self).__init__(**kwargs) self.ip_configurations = kwargs.get('ip_configurations', None) self.container_network_interfaces = kwargs.get('container_network_interfaces', None) + self.provisioning_state = None + self.name = kwargs.get('name', None) + self.type = None self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_py3.py index 11f65bbdbe3..9f18bda7fc7 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_configuration_py3.py @@ -15,6 +15,9 @@ class ContainerNetworkInterfaceConfiguration(SubResource): """Container network interface configruation child resource. + Variables are only populated by the server, and will be ignored when + sending a request. + :param id: Resource ID. :type id: str :param ip_configurations: A list of ip configurations of the container @@ -25,20 +28,38 @@ class ContainerNetworkInterfaceConfiguration(SubResource): interfaces created from this container network interface configuration. :type container_network_interfaces: list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterface] + :ivar provisioning_state: The provisioning state of the resource. + :vartype provisioning_state: str + :param name: The name of the resource. This name can be used to access the + resource. + :type name: str + :ivar type: Sub Resource type. + :vartype type: str :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str """ + _validation = { + 'provisioning_state': {'readonly': True}, + 'type': {'readonly': True}, + } + _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, 'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[IPConfigurationProfile]'}, 'container_network_interfaces': {'key': 'properties.containerNetworkInterfaces', 'type': '[ContainerNetworkInterface]'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, ip_configurations=None, container_network_interfaces=None, etag: str=None, **kwargs) -> None: + def __init__(self, *, id: str=None, ip_configurations=None, container_network_interfaces=None, name: str=None, etag: str=None, **kwargs) -> None: super(ContainerNetworkInterfaceConfiguration, self).__init__(id=id, **kwargs) self.ip_configurations = ip_configurations self.container_network_interfaces = container_network_interfaces + self.provisioning_state = None + self.name = name + self.type = None self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_ip_configuration.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_ip_configuration.py new file mode 100644 index 00000000000..457fc24a3f6 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_ip_configuration.py @@ -0,0 +1,50 @@ +# 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 ContainerNetworkInterfaceIpConfiguration(Model): + """The ip configuration for a container network interface. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar provisioning_state: The provisioning state of the resource. + :vartype provisioning_state: str + :param name: The name of the resource. This name can be used to access the + resource. + :type name: str + :ivar type: Sub Resource type. + :vartype type: str + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _validation = { + 'provisioning_state': {'readonly': True}, + 'type': {'readonly': True}, + } + + _attribute_map = { + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ContainerNetworkInterfaceIpConfiguration, self).__init__(**kwargs) + self.provisioning_state = None + self.name = kwargs.get('name', None) + self.type = None + self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_ip_configuration_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_ip_configuration_py3.py new file mode 100644 index 00000000000..adea92da1db --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_ip_configuration_py3.py @@ -0,0 +1,50 @@ +# 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 ContainerNetworkInterfaceIpConfiguration(Model): + """The ip configuration for a container network interface. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar provisioning_state: The provisioning state of the resource. + :vartype provisioning_state: str + :param name: The name of the resource. This name can be used to access the + resource. + :type name: str + :ivar type: Sub Resource type. + :vartype type: str + :param etag: A unique read-only string that changes whenever the resource + is updated. + :type etag: str + """ + + _validation = { + 'provisioning_state': {'readonly': True}, + 'type': {'readonly': True}, + } + + _attribute_map = { + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, + 'etag': {'key': 'etag', 'type': 'str'}, + } + + def __init__(self, *, name: str=None, etag: str=None, **kwargs) -> None: + super(ContainerNetworkInterfaceIpConfiguration, self).__init__(**kwargs) + self.provisioning_state = None + self.name = name + self.type = None + self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_py3.py index 9ecbaf27d74..accf1a78f17 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_network_interface_py3.py @@ -15,6 +15,9 @@ class ContainerNetworkInterface(SubResource): """Container network interface child resource. + Variables are only populated by the server, and will be ignored when + sending a request. + :param id: Resource ID. :type id: str :param container_network_interface_configuration: Container network @@ -25,20 +28,44 @@ class ContainerNetworkInterface(SubResource): :param container: Reference to the conatinaer to which this container network interface is attached. :type container: ~azure.mgmt.network.v2018_08_01.models.Container + :param ip_configurations: Reference to the ip configuration on this + container nic. + :type ip_configurations: + list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfaceIpConfiguration] + :ivar provisioning_state: The provisioning state of the resource. + :vartype provisioning_state: str + :param name: The name of the resource. This name can be used to access the + resource. + :type name: str + :ivar type: Sub Resource type. + :vartype type: str :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str """ + _validation = { + 'provisioning_state': {'readonly': True}, + 'type': {'readonly': True}, + } + _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, 'container_network_interface_configuration': {'key': 'properties.containerNetworkInterfaceConfiguration', 'type': 'ContainerNetworkInterfaceConfiguration'}, 'container': {'key': 'properties.container', 'type': 'Container'}, + 'ip_configurations': {'key': 'properties.ipConfigurations', 'type': '[ContainerNetworkInterfaceIpConfiguration]'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, container_network_interface_configuration=None, container=None, etag: str=None, **kwargs) -> None: + def __init__(self, *, id: str=None, container_network_interface_configuration=None, container=None, ip_configurations=None, name: str=None, etag: str=None, **kwargs) -> None: super(ContainerNetworkInterface, self).__init__(id=id, **kwargs) self.container_network_interface_configuration = container_network_interface_configuration self.container = container + self.ip_configurations = ip_configurations + self.provisioning_state = None + self.name = name + self.type = None self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_py3.py index 5614fda898d..cb5f7e24793 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/container_py3.py @@ -9,25 +9,19 @@ # regenerated. # -------------------------------------------------------------------------- -from msrest.serialization import Model +from .sub_resource_py3 import SubResource -class Container(Model): +class Container(SubResource): """Reference to container resource in remote resource provider. - :param container_uri: ARM Uri for the container. - :type container_uri: str - :param etag: A unique read-only string that changes whenever the resource - is updated. - :type etag: str + :param id: Resource ID. + :type id: str """ _attribute_map = { - 'container_uri': {'key': 'properties.containerUri', 'type': 'str'}, - 'etag': {'key': 'etag', 'type': 'str'}, + 'id': {'key': 'id', 'type': 'str'}, } - def __init__(self, *, container_uri: str=None, etag: str=None, **kwargs) -> None: - super(Container, self).__init__(**kwargs) - self.container_uri = container_uri - self.etag = etag + def __init__(self, *, id: str=None, **kwargs) -> None: + super(Container, self).__init__(id=id, **kwargs) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_peering_id.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_peering_id.py new file mode 100644 index 00000000000..8e20d23a582 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_peering_id.py @@ -0,0 +1,28 @@ +# 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 ExpressRouteCircuitPeeringId(Model): + """ExpressRoute circuit peering identifier. + + :param id: The ID of the ExpressRoute circuit peering. + :type id: str + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ExpressRouteCircuitPeeringId, self).__init__(**kwargs) + self.id = kwargs.get('id', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_peering_id_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_peering_id_py3.py new file mode 100644 index 00000000000..0261435f5ec --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_circuit_peering_id_py3.py @@ -0,0 +1,28 @@ +# 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 ExpressRouteCircuitPeeringId(Model): + """ExpressRoute circuit peering identifier. + + :param id: The ID of the ExpressRoute circuit peering. + :type id: str + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + } + + def __init__(self, *, id: str=None, **kwargs) -> None: + super(ExpressRouteCircuitPeeringId, self).__init__(**kwargs) + self.id = id diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_connection.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_connection.py index 74ffadec81a..b8ab0ea3fd2 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_connection.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_connection.py @@ -26,9 +26,10 @@ class ExpressRouteConnection(SubResource): values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :vartype provisioning_state: str or ~azure.mgmt.network.v2018_08_01.models.ProvisioningState - :param express_route_connection_id: The ID of the ExpressRoute circuit + :param express_route_circuit_peering: Required. The ExpressRoute circuit peering. - :type express_route_connection_id: str + :type express_route_circuit_peering: + ~azure.mgmt.network.v2018_08_01.models.ExpressRouteCircuitPeeringId :param authorization_key: Authorization key to establish the connection. :type authorization_key: str :param routing_weight: The routing weight associated to the connection. @@ -39,13 +40,14 @@ class ExpressRouteConnection(SubResource): _validation = { 'provisioning_state': {'readonly': True}, + 'express_route_circuit_peering': {'required': True}, 'name': {'required': True}, } _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'express_route_connection_id': {'key': 'properties.expressRouteCircuitPeering.id', 'type': 'str'}, + 'express_route_circuit_peering': {'key': 'properties.expressRouteCircuitPeering', 'type': 'ExpressRouteCircuitPeeringId'}, 'authorization_key': {'key': 'properties.authorizationKey', 'type': 'str'}, 'routing_weight': {'key': 'properties.routingWeight', 'type': 'int'}, 'name': {'key': 'name', 'type': 'str'}, @@ -54,7 +56,7 @@ class ExpressRouteConnection(SubResource): def __init__(self, **kwargs): super(ExpressRouteConnection, self).__init__(**kwargs) self.provisioning_state = None - self.express_route_connection_id = kwargs.get('express_route_connection_id', None) + self.express_route_circuit_peering = kwargs.get('express_route_circuit_peering', None) self.authorization_key = kwargs.get('authorization_key', None) self.routing_weight = kwargs.get('routing_weight', None) self.name = kwargs.get('name', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_connection_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_connection_py3.py index 206af6a6164..247cc748523 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_connection_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_connection_py3.py @@ -26,9 +26,10 @@ class ExpressRouteConnection(SubResource): values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :vartype provisioning_state: str or ~azure.mgmt.network.v2018_08_01.models.ProvisioningState - :param express_route_connection_id: The ID of the ExpressRoute circuit + :param express_route_circuit_peering: Required. The ExpressRoute circuit peering. - :type express_route_connection_id: str + :type express_route_circuit_peering: + ~azure.mgmt.network.v2018_08_01.models.ExpressRouteCircuitPeeringId :param authorization_key: Authorization key to establish the connection. :type authorization_key: str :param routing_weight: The routing weight associated to the connection. @@ -39,22 +40,23 @@ class ExpressRouteConnection(SubResource): _validation = { 'provisioning_state': {'readonly': True}, + 'express_route_circuit_peering': {'required': True}, 'name': {'required': True}, } _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'express_route_connection_id': {'key': 'properties.expressRouteCircuitPeering.id', 'type': 'str'}, + 'express_route_circuit_peering': {'key': 'properties.expressRouteCircuitPeering', 'type': 'ExpressRouteCircuitPeeringId'}, 'authorization_key': {'key': 'properties.authorizationKey', 'type': 'str'}, 'routing_weight': {'key': 'properties.routingWeight', 'type': 'int'}, 'name': {'key': 'name', 'type': 'str'}, } - def __init__(self, *, name: str, id: str=None, express_route_connection_id: str=None, authorization_key: str=None, routing_weight: int=None, **kwargs) -> None: + def __init__(self, *, express_route_circuit_peering, name: str, id: str=None, authorization_key: str=None, routing_weight: int=None, **kwargs) -> None: super(ExpressRouteConnection, self).__init__(id=id, **kwargs) self.provisioning_state = None - self.express_route_connection_id = express_route_connection_id + self.express_route_circuit_peering = express_route_circuit_peering self.authorization_key = authorization_key self.routing_weight = routing_weight self.name = name diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_gateway.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_gateway.py index bf1c32cb216..07d9850a9eb 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_gateway.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_gateway.py @@ -18,6 +18,8 @@ class ExpressRouteGateway(Resource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :param id: Resource ID. :type id: str :ivar name: Resource name. @@ -39,11 +41,9 @@ class ExpressRouteGateway(Resource): values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :vartype provisioning_state: str or ~azure.mgmt.network.v2018_08_01.models.ProvisioningState - :param express_route_gateway_id: The resource URI for the Virtual Hub - where the ExpressRoute gateway is or will be deployed. The Virtual Hub - resource and the ExpressRoute gateway resource reside in the same - subscription. - :type express_route_gateway_id: str + :param virtual_hub: Required. The Virtual Hub where the ExpressRoute + gateway is or will be deployed. + :type virtual_hub: ~azure.mgmt.network.v2018_08_01.models.VirtualHubId :ivar etag: A unique read-only string that changes whenever the resource is updated. :vartype etag: str @@ -54,6 +54,7 @@ class ExpressRouteGateway(Resource): 'type': {'readonly': True}, 'express_route_connections': {'readonly': True}, 'provisioning_state': {'readonly': True}, + 'virtual_hub': {'required': True}, 'etag': {'readonly': True}, } @@ -66,7 +67,7 @@ class ExpressRouteGateway(Resource): 'auto_scale_configuration': {'key': 'properties.autoScaleConfiguration', 'type': 'ExpressRouteGatewayPropertiesAutoScaleConfiguration'}, 'express_route_connections': {'key': 'properties.expressRouteConnections', 'type': '[ExpressRouteConnection]'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'express_route_gateway_id': {'key': 'properties.virtualHub.id', 'type': 'str'}, + 'virtual_hub': {'key': 'properties.virtualHub', 'type': 'VirtualHubId'}, 'etag': {'key': 'etag', 'type': 'str'}, } @@ -75,5 +76,5 @@ def __init__(self, **kwargs): self.auto_scale_configuration = kwargs.get('auto_scale_configuration', None) self.express_route_connections = None self.provisioning_state = None - self.express_route_gateway_id = kwargs.get('express_route_gateway_id', None) + self.virtual_hub = kwargs.get('virtual_hub', None) self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_gateway_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_gateway_py3.py index 723bb8e472c..9154f326ddc 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_gateway_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/express_route_gateway_py3.py @@ -18,6 +18,8 @@ class ExpressRouteGateway(Resource): Variables are only populated by the server, and will be ignored when sending a request. + All required parameters must be populated in order to send to Azure. + :param id: Resource ID. :type id: str :ivar name: Resource name. @@ -39,11 +41,9 @@ class ExpressRouteGateway(Resource): values include: 'Succeeded', 'Updating', 'Deleting', 'Failed' :vartype provisioning_state: str or ~azure.mgmt.network.v2018_08_01.models.ProvisioningState - :param express_route_gateway_id: The resource URI for the Virtual Hub - where the ExpressRoute gateway is or will be deployed. The Virtual Hub - resource and the ExpressRoute gateway resource reside in the same - subscription. - :type express_route_gateway_id: str + :param virtual_hub: Required. The Virtual Hub where the ExpressRoute + gateway is or will be deployed. + :type virtual_hub: ~azure.mgmt.network.v2018_08_01.models.VirtualHubId :ivar etag: A unique read-only string that changes whenever the resource is updated. :vartype etag: str @@ -54,6 +54,7 @@ class ExpressRouteGateway(Resource): 'type': {'readonly': True}, 'express_route_connections': {'readonly': True}, 'provisioning_state': {'readonly': True}, + 'virtual_hub': {'required': True}, 'etag': {'readonly': True}, } @@ -66,14 +67,14 @@ class ExpressRouteGateway(Resource): 'auto_scale_configuration': {'key': 'properties.autoScaleConfiguration', 'type': 'ExpressRouteGatewayPropertiesAutoScaleConfiguration'}, 'express_route_connections': {'key': 'properties.expressRouteConnections', 'type': '[ExpressRouteConnection]'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, - 'express_route_gateway_id': {'key': 'properties.virtualHub.id', 'type': 'str'}, + 'virtual_hub': {'key': 'properties.virtualHub', 'type': 'VirtualHubId'}, 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, location: str=None, tags=None, auto_scale_configuration=None, express_route_gateway_id: str=None, **kwargs) -> None: + def __init__(self, *, virtual_hub, id: str=None, location: str=None, tags=None, auto_scale_configuration=None, **kwargs) -> None: super(ExpressRouteGateway, self).__init__(id=id, location=location, tags=tags, **kwargs) self.auto_scale_configuration = auto_scale_configuration self.express_route_connections = None self.provisioning_state = None - self.express_route_gateway_id = express_route_gateway_id + self.virtual_hub = virtual_hub self.etag = None diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile.py index 08469c67093..6fdf21023fb 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile.py @@ -15,23 +15,44 @@ class IPConfigurationProfile(SubResource): """IP configuration profile child resource. + Variables are only populated by the server, and will be ignored when + sending a request. + :param id: Resource ID. :type id: str :param subnet: The reference of the subnet resource to create a contatainer network interface ip configruation. :type subnet: ~azure.mgmt.network.v2018_08_01.models.Subnet + :ivar provisioning_state: The provisioning state of the resource. + :vartype provisioning_state: str + :param name: The name of the resource. This name can be used to access the + resource. + :type name: str + :ivar type: Sub Resource type. + :vartype type: str :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str """ + _validation = { + 'provisioning_state': {'readonly': True}, + 'type': {'readonly': True}, + } + _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, 'subnet': {'key': 'properties.subnet', 'type': 'Subnet'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } def __init__(self, **kwargs): super(IPConfigurationProfile, self).__init__(**kwargs) self.subnet = kwargs.get('subnet', None) + self.provisioning_state = None + self.name = kwargs.get('name', None) + self.type = None self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_py3.py index c5640960ea3..4d6af84b55e 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/ip_configuration_profile_py3.py @@ -15,23 +15,44 @@ class IPConfigurationProfile(SubResource): """IP configuration profile child resource. + Variables are only populated by the server, and will be ignored when + sending a request. + :param id: Resource ID. :type id: str :param subnet: The reference of the subnet resource to create a contatainer network interface ip configruation. :type subnet: ~azure.mgmt.network.v2018_08_01.models.Subnet + :ivar provisioning_state: The provisioning state of the resource. + :vartype provisioning_state: str + :param name: The name of the resource. This name can be used to access the + resource. + :type name: str + :ivar type: Sub Resource type. + :vartype type: str :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str """ + _validation = { + 'provisioning_state': {'readonly': True}, + 'type': {'readonly': True}, + } + _attribute_map = { 'id': {'key': 'id', 'type': 'str'}, 'subnet': {'key': 'properties.subnet', 'type': 'Subnet'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'type': {'key': 'type', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } - def __init__(self, *, id: str=None, subnet=None, etag: str=None, **kwargs) -> None: + def __init__(self, *, id: str=None, subnet=None, name: str=None, etag: str=None, **kwargs) -> None: super(IPConfigurationProfile, self).__init__(id=id, **kwargs) self.subnet = subnet + self.provisioning_state = None + self.name = name + self.type = None self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile.py index 904e5dab98a..2cb8ec27324 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile.py @@ -36,6 +36,11 @@ class NetworkProfile(Resource): network interface configurations. :type container_network_interface_configurations: list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfaceConfiguration] + :ivar resource_guid: The resource GUID property of the network interface + resource. + :vartype resource_guid: str + :ivar provisioning_state: The provisioning state of the resource. + :vartype provisioning_state: str :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str @@ -44,6 +49,8 @@ class NetworkProfile(Resource): _validation = { 'name': {'readonly': True}, 'type': {'readonly': True}, + 'resource_guid': {'readonly': True}, + 'provisioning_state': {'readonly': True}, } _attribute_map = { @@ -54,6 +61,8 @@ class NetworkProfile(Resource): 'tags': {'key': 'tags', 'type': '{str}'}, 'container_network_interfaces': {'key': 'properties.containerNetworkInterfaces', 'type': '[ContainerNetworkInterface]'}, 'container_network_interface_configurations': {'key': 'properties.containerNetworkInterfaceConfigurations', 'type': '[ContainerNetworkInterfaceConfiguration]'}, + 'resource_guid': {'key': 'properties.resourceGuid', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } @@ -61,4 +70,6 @@ def __init__(self, **kwargs): super(NetworkProfile, self).__init__(**kwargs) self.container_network_interfaces = kwargs.get('container_network_interfaces', None) self.container_network_interface_configurations = kwargs.get('container_network_interface_configurations', None) + self.resource_guid = None + self.provisioning_state = None self.etag = kwargs.get('etag', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_py3.py index 09b11e85e8b..e20879cd92e 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_py3.py +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/network_profile_py3.py @@ -36,6 +36,11 @@ class NetworkProfile(Resource): network interface configurations. :type container_network_interface_configurations: list[~azure.mgmt.network.v2018_08_01.models.ContainerNetworkInterfaceConfiguration] + :ivar resource_guid: The resource GUID property of the network interface + resource. + :vartype resource_guid: str + :ivar provisioning_state: The provisioning state of the resource. + :vartype provisioning_state: str :param etag: A unique read-only string that changes whenever the resource is updated. :type etag: str @@ -44,6 +49,8 @@ class NetworkProfile(Resource): _validation = { 'name': {'readonly': True}, 'type': {'readonly': True}, + 'resource_guid': {'readonly': True}, + 'provisioning_state': {'readonly': True}, } _attribute_map = { @@ -54,6 +61,8 @@ class NetworkProfile(Resource): 'tags': {'key': 'tags', 'type': '{str}'}, 'container_network_interfaces': {'key': 'properties.containerNetworkInterfaces', 'type': '[ContainerNetworkInterface]'}, 'container_network_interface_configurations': {'key': 'properties.containerNetworkInterfaceConfigurations', 'type': '[ContainerNetworkInterfaceConfiguration]'}, + 'resource_guid': {'key': 'properties.resourceGuid', 'type': 'str'}, + 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'etag': {'key': 'etag', 'type': 'str'}, } @@ -61,4 +70,6 @@ def __init__(self, *, id: str=None, location: str=None, tags=None, container_net super(NetworkProfile, self).__init__(id=id, location=location, tags=tags, **kwargs) self.container_network_interfaces = container_network_interfaces self.container_network_interface_configurations = container_network_interface_configurations + self.resource_guid = None + self.provisioning_state = None self.etag = etag diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_id.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_id.py new file mode 100644 index 00000000000..6754cbd3b4f --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_id.py @@ -0,0 +1,30 @@ +# 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 VirtualHubId(Model): + """Virtual Hub identifier. + + :param id: The resource URI for the Virtual Hub where the ExpressRoute + gateway is or will be deployed. The Virtual Hub resource and the + ExpressRoute gateway resource reside in the same subscription. + :type id: str + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(VirtualHubId, self).__init__(**kwargs) + self.id = kwargs.get('id', None) diff --git a/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_id_py3.py b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_id_py3.py new file mode 100644 index 00000000000..730c061d5b7 --- /dev/null +++ b/azure-mgmt-network/azure/mgmt/network/v2018_08_01/models/virtual_hub_id_py3.py @@ -0,0 +1,30 @@ +# 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 VirtualHubId(Model): + """Virtual Hub identifier. + + :param id: The resource URI for the Virtual Hub where the ExpressRoute + gateway is or will be deployed. The Virtual Hub resource and the + ExpressRoute gateway resource reside in the same subscription. + :type id: str + """ + + _attribute_map = { + 'id': {'key': 'id', 'type': 'str'}, + } + + def __init__(self, *, id: str=None, **kwargs) -> None: + super(VirtualHubId, self).__init__(**kwargs) + self.id = id From 82e77dfcbd3ba87ace1b83879159987d5b8ad07d Mon Sep 17 00:00:00 2001 From: azuresdkci Date: Thu, 6 Sep 2018 22:45:48 +0000 Subject: [PATCH 4/4] Packaging update of azure-mgmt-network --- azure-mgmt-network/setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-mgmt-network/setup.py b/azure-mgmt-network/setup.py index fbb486adf66..6148dcdc021 100644 --- a/azure-mgmt-network/setup.py +++ b/azure-mgmt-network/setup.py @@ -80,7 +80,7 @@ install_requires=[ 'msrest>=0.5.0', 'msrestazure>=0.4.32,<2.0.0', - 'azure-common~=1.1,>=1.1.9', + 'azure-common~=1.1', ], cmdclass=cmdclass )