[AutoPR network/resource-manager] Plug Network 2018-04 for Python

azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/ddos_protection_plan.py

@@ -9,17 +9,17 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.serialization import Model
+from .resource import Resource
 
 
-class DdosProtectionPlan(Model):
+class DdosProtectionPlan(Resource):
     """A DDoS protection plan in a resource group.
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar id: Resource ID.
-    :vartype id: str
+    :param id: Resource ID.
+    :type id: str
     :ivar name: Resource name.
     :vartype name: str
     :ivar type: Resource type.
@@ -47,7 +47,6 @@ class DdosProtectionPlan(Model):
     """
 
     _validation = {
-        'id': {'readonly': True},
         'name': {'readonly': True},
         'type': {'readonly': True},
         'resource_guid': {'readonly': True},
@@ -70,11 +69,6 @@ class DdosProtectionPlan(Model):
 
     def __init__(self, **kwargs):
         super(DdosProtectionPlan, self).__init__(**kwargs)
-        self.id = None
-        self.name = None
-        self.type = None
-        self.location = kwargs.get('location', None)
-        self.tags = kwargs.get('tags', None)
         self.resource_guid = None
         self.provisioning_state = None
         self.virtual_networks = None

azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/ddos_protection_plan_py3.py

@@ -9,17 +9,17 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from msrest.serialization import Model
+from .resource import Resource
 
 
-class DdosProtectionPlan(Model):
+class DdosProtectionPlan(Resource):
     """A DDoS protection plan in a resource group.
 
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar id: Resource ID.
-    :vartype id: str
+    :param id: Resource ID.
+    :type id: str
     :ivar name: Resource name.
     :vartype name: str
     :ivar type: Resource type.
@@ -47,7 +47,6 @@ class DdosProtectionPlan(Model):
     """
 
     _validation = {
-        'id': {'readonly': True},
         'name': {'readonly': True},
         'type': {'readonly': True},
         'resource_guid': {'readonly': True},
@@ -68,13 +67,8 @@ class DdosProtectionPlan(Model):
         'etag': {'key': 'etag', 'type': 'str'},
     }
 
-    def __init__(self, *, location: str=None, tags=None, **kwargs) -> None:
-        super(DdosProtectionPlan, self).__init__(**kwargs)
-        self.id = None
-        self.name = None
-        self.type = None
-        self.location = location
-        self.tags = tags
+    def __init__(self, *, id: str=None, location: str=None, tags=None, **kwargs) -> None:
+        super(DdosProtectionPlan, self).__init__(id=id, location=location, tags=tags, **kwargs)
         self.resource_guid = None
         self.provisioning_state = None
         self.virtual_networks = None

azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/express_route_cross_connection.py

@@ -34,12 +34,12 @@ class ExpressRouteCrossConnection(Resource):
     :vartype secondary_azure_port: str
     :ivar s_tag: The identifier of the circuit traffic.
     :vartype s_tag: int
-    :ivar peering_location: The peering location of the ExpressRoute circuit.
-    :vartype peering_location: str
-    :ivar bandwidth_in_mbps: The circuit bandwidth In Mbps.
-    :vartype bandwidth_in_mbps: int
-    :ivar express_route_circuit: The ExpressRouteCircuit
-    :vartype express_route_circuit:
+    :param peering_location: The peering location of the ExpressRoute circuit.
+    :type peering_location: str
+    :param bandwidth_in_mbps: The circuit bandwidth In Mbps.
+    :type bandwidth_in_mbps: int
+    :param express_route_circuit: The ExpressRouteCircuit
+    :type express_route_circuit:
      ~azure.mgmt.network.v2018_02_01.models.ExpressRouteCircuitReference
     :param service_provider_provisioning_state: The provisioning state of the
      circuit in the connectivity provider system. Possible values are
@@ -67,9 +67,6 @@ class ExpressRouteCrossConnection(Resource):
         'primary_azure_port': {'readonly': True},
         'secondary_azure_port': {'readonly': True},
         's_tag': {'readonly': True},
-        'peering_location': {'readonly': True},
-        'bandwidth_in_mbps': {'readonly': True},
-        'express_route_circuit': {'readonly': True},
         'provisioning_state': {'readonly': True},
         'etag': {'readonly': True},
     }
@@ -98,9 +95,9 @@ def __init__(self, **kwargs):
         self.primary_azure_port = None
         self.secondary_azure_port = None
         self.s_tag = None
-        self.peering_location = None
-        self.bandwidth_in_mbps = None
-        self.express_route_circuit = None
+        self.peering_location = kwargs.get('peering_location', None)
+        self.bandwidth_in_mbps = kwargs.get('bandwidth_in_mbps', None)
+        self.express_route_circuit = kwargs.get('express_route_circuit', None)
         self.service_provider_provisioning_state = kwargs.get('service_provider_provisioning_state', None)
         self.service_provider_notes = kwargs.get('service_provider_notes', None)
         self.provisioning_state = None

azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/express_route_cross_connection_peering.py

@@ -50,8 +50,8 @@ class ExpressRouteCrossConnectionPeering(SubResource):
     :ivar provisioning_state: Gets the provisioning state of the public IP
      resource. Possible values are: 'Updating', 'Deleting', and 'Failed'.
     :vartype provisioning_state: str
-    :ivar gateway_manager_etag: The GatewayManager Etag.
-    :vartype gateway_manager_etag: str
+    :param gateway_manager_etag: The GatewayManager Etag.
+    :type gateway_manager_etag: str
     :param last_modified_by: Gets whether the provider or the customer last
      modified the peering.
     :type last_modified_by: str
@@ -72,7 +72,6 @@ class ExpressRouteCrossConnectionPeering(SubResource):
         'primary_azure_port': {'readonly': True},
         'secondary_azure_port': {'readonly': True},
         'provisioning_state': {'readonly': True},
-        'gateway_manager_etag': {'readonly': True},
         'etag': {'readonly': True},
     }
 
@@ -111,7 +110,7 @@ def __init__(self, **kwargs):
         self.vlan_id = kwargs.get('vlan_id', None)
         self.microsoft_peering_config = kwargs.get('microsoft_peering_config', None)
         self.provisioning_state = None
-        self.gateway_manager_etag = None
+        self.gateway_manager_etag = kwargs.get('gateway_manager_etag', None)
         self.last_modified_by = kwargs.get('last_modified_by', None)
         self.ipv6_peering_config = kwargs.get('ipv6_peering_config', None)
         self.name = kwargs.get('name', None)

azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/express_route_cross_connection_peering_py3.py

@@ -50,8 +50,8 @@ class ExpressRouteCrossConnectionPeering(SubResource):
     :ivar provisioning_state: Gets the provisioning state of the public IP
      resource. Possible values are: 'Updating', 'Deleting', and 'Failed'.
     :vartype provisioning_state: str
-    :ivar gateway_manager_etag: The GatewayManager Etag.
-    :vartype gateway_manager_etag: str
+    :param gateway_manager_etag: The GatewayManager Etag.
+    :type gateway_manager_etag: str
     :param last_modified_by: Gets whether the provider or the customer last
      modified the peering.
     :type last_modified_by: str
@@ -72,7 +72,6 @@ class ExpressRouteCrossConnectionPeering(SubResource):
         'primary_azure_port': {'readonly': True},
         'secondary_azure_port': {'readonly': True},
         'provisioning_state': {'readonly': True},
-        'gateway_manager_etag': {'readonly': True},
         'etag': {'readonly': True},
     }
 
@@ -97,7 +96,7 @@ class ExpressRouteCrossConnectionPeering(SubResource):
         'etag': {'key': 'etag', 'type': 'str'},
     }
 
-    def __init__(self, *, id: str=None, peering_type=None, state=None, peer_asn: int=None, primary_peer_address_prefix: str=None, secondary_peer_address_prefix: str=None, shared_key: str=None, vlan_id: int=None, microsoft_peering_config=None, last_modified_by: str=None, ipv6_peering_config=None, name: str=None, **kwargs) -> None:
+    def __init__(self, *, id: str=None, peering_type=None, state=None, peer_asn: int=None, primary_peer_address_prefix: str=None, secondary_peer_address_prefix: str=None, shared_key: str=None, vlan_id: int=None, microsoft_peering_config=None, gateway_manager_etag: str=None, last_modified_by: str=None, ipv6_peering_config=None, name: str=None, **kwargs) -> None:
         super(ExpressRouteCrossConnectionPeering, self).__init__(id=id, **kwargs)
         self.peering_type = peering_type
         self.state = state
@@ -111,7 +110,7 @@ def __init__(self, *, id: str=None, peering_type=None, state=None, peer_asn: int
         self.vlan_id = vlan_id
         self.microsoft_peering_config = microsoft_peering_config
         self.provisioning_state = None
-        self.gateway_manager_etag = None
+        self.gateway_manager_etag = gateway_manager_etag
         self.last_modified_by = last_modified_by
         self.ipv6_peering_config = ipv6_peering_config
         self.name = name

azure-mgmt-network/azure/mgmt/network/v2018_02_01/models/express_route_cross_connection_py3.py

@@ -34,12 +34,12 @@ class ExpressRouteCrossConnection(Resource):
     :vartype secondary_azure_port: str
     :ivar s_tag: The identifier of the circuit traffic.
     :vartype s_tag: int
-    :ivar peering_location: The peering location of the ExpressRoute circuit.
-    :vartype peering_location: str
-    :ivar bandwidth_in_mbps: The circuit bandwidth In Mbps.
-    :vartype bandwidth_in_mbps: int
-    :ivar express_route_circuit: The ExpressRouteCircuit
-    :vartype express_route_circuit:
+    :param peering_location: The peering location of the ExpressRoute circuit.
+    :type peering_location: str
+    :param bandwidth_in_mbps: The circuit bandwidth In Mbps.
+    :type bandwidth_in_mbps: int
+    :param express_route_circuit: The ExpressRouteCircuit
+    :type express_route_circuit:
      ~azure.mgmt.network.v2018_02_01.models.ExpressRouteCircuitReference
     :param service_provider_provisioning_state: The provisioning state of the
      circuit in the connectivity provider system. Possible values are
@@ -67,9 +67,6 @@ class ExpressRouteCrossConnection(Resource):
         'primary_azure_port': {'readonly': True},
         'secondary_azure_port': {'readonly': True},
         's_tag': {'readonly': True},
-        'peering_location': {'readonly': True},
-        'bandwidth_in_mbps': {'readonly': True},
-        'express_route_circuit': {'readonly': True},
         'provisioning_state': {'readonly': True},
         'etag': {'readonly': True},
     }
@@ -93,14 +90,14 @@ class ExpressRouteCrossConnection(Resource):
         'etag': {'key': 'etag', 'type': 'str'},
     }
 
-    def __init__(self, *, id: str=None, location: str=None, tags=None, service_provider_provisioning_state=None, service_provider_notes: str=None, peerings=None, **kwargs) -> None:
+    def __init__(self, *, id: str=None, location: str=None, tags=None, peering_location: str=None, bandwidth_in_mbps: int=None, express_route_circuit=None, service_provider_provisioning_state=None, service_provider_notes: str=None, peerings=None, **kwargs) -> None:
         super(ExpressRouteCrossConnection, self).__init__(id=id, location=location, tags=tags, **kwargs)
         self.primary_azure_port = None
         self.secondary_azure_port = None
         self.s_tag = None
-        self.peering_location = None
-        self.bandwidth_in_mbps = None
-        self.express_route_circuit = None
+        self.peering_location = peering_location
+        self.bandwidth_in_mbps = bandwidth_in_mbps
+        self.express_route_circuit = express_route_circuit
         self.service_provider_provisioning_state = service_provider_provisioning_state
         self.service_provider_notes = service_provider_notes
         self.provisioning_state = None

azure-mgmt-network/azure/mgmt/network/v2018_02_01/operations/ddos_protection_plans_operations.py

@@ -185,9 +185,7 @@ def get(
 
 
     def _create_or_update_initial(
-            self, resource_group_name, ddos_protection_plan_name, location=None, tags=None, custom_headers=None, raw=False, **operation_config):
-        parameters = models.DdosProtectionPlan(location=location, tags=tags)
-
+            self, resource_group_name, ddos_protection_plan_name, parameters, custom_headers=None, raw=False, **operation_config):
         # Construct URL
         url = self.create_or_update.metadata['url']
         path_format_arguments = {
@@ -238,18 +236,18 @@ def _create_or_update_initial(
         return deserialized
 
     def create_or_update(
-            self, resource_group_name, ddos_protection_plan_name, location=None, tags=None, custom_headers=None, raw=False, polling=True, **operation_config):
+            self, resource_group_name, ddos_protection_plan_name, parameters, custom_headers=None, raw=False, polling=True, **operation_config):
         """Creates or updates a DDoS protection plan.
 
         :param resource_group_name: The name of the resource group.
         :type resource_group_name: str
         :param ddos_protection_plan_name: The name of the DDoS protection
          plan.
         :type ddos_protection_plan_name: str
-        :param location: Resource location.
-        :type location: str
-        :param tags: Resource tags.
-        :type tags: dict[str, str]
+        :param parameters: Parameters supplied to the create or update
+         operation.
+        :type parameters:
+         ~azure.mgmt.network.v2018_02_01.models.DdosProtectionPlan
         :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
@@ -266,8 +264,7 @@ def create_or_update(
         raw_result = self._create_or_update_initial(
             resource_group_name=resource_group_name,
             ddos_protection_plan_name=ddos_protection_plan_name,
-            location=location,
-            tags=tags,
+            parameters=parameters,
             custom_headers=custom_headers,
             raw=True,
             **operation_config

azure-mgmt-network/azure/mgmt/network/v2018_04_01/__init__.py

@@ -0,0 +1,18 @@
+# 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 .network_management_client import NetworkManagementClient
+from .version import VERSION
+
+__all__ = ['NetworkManagementClient']
+
+__version__ = VERSION
+