Generated from bc9de4c17997df793ae578bfb852917389e1f3d0

hightoon · Mar 25, 2016 · 1787847 · 1787847
1 parent 14536e3
commit 1787847
Show file tree

Hide file tree

Showing 33 changed files with 881 additions and 237 deletions.
diff --git a/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py b/azure-mgmt-compute/azure/mgmt/compute/compute_management_client.py
@@ -64,7 +64,7 @@ class ComputeManagementClientConfiguration(AzureConfiguration):
     """
 
     def __init__(
-            self, credentials, subscription_id, api_version='2015-06-15', accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None):
+            self, credentials, subscription_id, api_version='2016-03-30', accept_language='en-US', long_running_operation_retry_timeout=30, generate_client_request_id=True, base_url=None, filepath=None):
 
         if credentials is None:
             raise ValueError('credentials must not be None.')

diff --git a/azure-mgmt-compute/azure/mgmt/compute/models/__init__.py b/azure-mgmt-compute/azure/mgmt/compute/models/__init__.py
@@ -102,7 +102,6 @@
 from .virtual_machine_scale_set_vm_paged import VirtualMachineScaleSetVMPaged
 from .compute_management_client_enums import (
     StatusLevelTypes,
-    ForceUpdateTagTypes,
     OperatingSystemTypes,
     VirtualMachineSizeTypes,
     CachingTypes,
@@ -199,7 +198,6 @@
     'VirtualMachineScaleSetSkuPaged',
     'VirtualMachineScaleSetVMPaged',
     'StatusLevelTypes',
-    'ForceUpdateTagTypes',
     'OperatingSystemTypes',
     'VirtualMachineSizeTypes',
     'CachingTypes',

diff --git a/azure-mgmt-compute/azure/mgmt/compute/models/compute_management_client_enums.py b/azure-mgmt-compute/azure/mgmt/compute/models/compute_management_client_enums.py
@@ -29,11 +29,6 @@ class StatusLevelTypes(Enum):
     error = "Error"
 
 
-class ForceUpdateTagTypes(Enum):
-
-    rerun_extension = "RerunExtension"
-
-
 class OperatingSystemTypes(Enum):
 
     windows = "Windows"

diff --git a/azure-mgmt-compute/azure/mgmt/compute/models/disk_encryption_settings.py b/azure-mgmt-compute/azure/mgmt/compute/models/disk_encryption_settings.py
@@ -39,17 +39,13 @@ class DiskEncryptionSettings(Model):
     :type enabled: bool
     """ 
 
-    _validation = {
-        'disk_encryption_key': {'required': True},
-    }
-
     _attribute_map = {
         'disk_encryption_key': {'key': 'diskEncryptionKey', 'type': 'KeyVaultSecretReference'},
         'key_encryption_key': {'key': 'keyEncryptionKey', 'type': 'KeyVaultKeyReference'},
         'enabled': {'key': 'enabled', 'type': 'bool'},
     }
 
-    def __init__(self, disk_encryption_key, key_encryption_key=None, enabled=None, **kwargs):
+    def __init__(self, disk_encryption_key=None, key_encryption_key=None, enabled=None, **kwargs):
         self.disk_encryption_key = disk_encryption_key
         self.key_encryption_key = key_encryption_key
         self.enabled = enabled
diff --git a/azure-mgmt-compute/azure/mgmt/compute/models/virtual_machine_extension.py b/azure-mgmt-compute/azure/mgmt/compute/models/virtual_machine_extension.py
@@ -38,7 +38,6 @@ class VirtualMachineExtension(Resource):
     :type tags: dict
     :param force_update_tag: Gets or sets how the extension handler should be
      forced to update even if the extension configuration has not changed.
-     Possible values include: 'RerunExtension'
     :type force_update_tag: str
     :param publisher: Gets or sets the name of the extension handler
      publisher.
@@ -77,7 +76,7 @@ class VirtualMachineExtension(Resource):
         'type': {'key': 'type', 'type': 'str'},
         'location': {'key': 'location', 'type': 'str'},
         'tags': {'key': 'tags', 'type': '{str}'},
-        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'ForceUpdateTagTypes'},
+        'force_update_tag': {'key': 'properties.forceUpdateTag', 'type': 'str'},
         'publisher': {'key': 'properties.publisher', 'type': 'str'},
         'virtual_machine_extension_type': {'key': 'properties.type', 'type': 'str'},
         'type_handler_version': {'key': 'properties.typeHandlerVersion', 'type': 'str'},

diff --git a/azure-mgmt-compute/azure/mgmt/compute/version.py b/azure-mgmt-compute/azure/mgmt/compute/version.py
@@ -19,5 +19,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "2015-06-15"
+VERSION = "2016-03-30"
 
diff --git a/azure-mgmt-network/azure/mgmt/network/models/__init__.py b/azure-mgmt-network/azure/mgmt/network/models/__init__.py
@@ -42,7 +42,11 @@
 from .express_route_circuit_service_provider_properties import ExpressRouteCircuitServiceProviderProperties
 from .express_route_circuit import ExpressRouteCircuit
 from .express_route_circuit_arp_table import ExpressRouteCircuitArpTable
+from .express_route_circuits_arp_table_list_result import ExpressRouteCircuitsArpTableListResult
 from .express_route_circuit_routes_table import ExpressRouteCircuitRoutesTable
+from .express_route_circuits_routes_table_list_result import ExpressRouteCircuitsRoutesTableListResult
+from .express_route_circuit_routes_table_summary import ExpressRouteCircuitRoutesTableSummary
+from .express_route_circuits_routes_table_summary_list_result import ExpressRouteCircuitsRoutesTableSummaryListResult
 from .express_route_service_provider_bandwidths_offered import ExpressRouteServiceProviderBandwidthsOffered
 from .express_route_service_provider import ExpressRouteServiceProvider
 from .subnet import Subnet
@@ -90,9 +94,6 @@
 from .application_gateway_paged import ApplicationGatewayPaged
 from .express_route_circuit_authorization_paged import ExpressRouteCircuitAuthorizationPaged
 from .express_route_circuit_peering_paged import ExpressRouteCircuitPeeringPaged
-from .express_route_circuit_arp_table_paged import ExpressRouteCircuitArpTablePaged
-from .express_route_circuit_routes_table_paged import ExpressRouteCircuitRoutesTablePaged
-from .express_route_circuit_stats_paged import ExpressRouteCircuitStatsPaged
 from .express_route_circuit_paged import ExpressRouteCircuitPaged
 from .express_route_service_provider_paged import ExpressRouteServiceProviderPaged
 from .load_balancer_paged import LoadBalancerPaged
@@ -123,11 +124,11 @@
     ExpressRouteCircuitSkuTier,
     ExpressRouteCircuitSkuFamily,
     ServiceProviderProvisioningState,
-    RouteNextHopType,
     SecurityRuleProtocol,
     SecurityRuleAccess,
     SecurityRuleDirection,
     TransportProtocol,
+    RouteNextHopType,
     LoadDistribution,
     ProbeProtocol,
     VirtualNetworkGatewayType,
@@ -164,7 +165,11 @@
     'ExpressRouteCircuitServiceProviderProperties',
     'ExpressRouteCircuit',
     'ExpressRouteCircuitArpTable',
+    'ExpressRouteCircuitsArpTableListResult',
     'ExpressRouteCircuitRoutesTable',
+    'ExpressRouteCircuitsRoutesTableListResult',
+    'ExpressRouteCircuitRoutesTableSummary',
+    'ExpressRouteCircuitsRoutesTableSummaryListResult',
     'ExpressRouteServiceProviderBandwidthsOffered',
     'ExpressRouteServiceProvider',
     'Subnet',
@@ -212,9 +217,6 @@
     'ApplicationGatewayPaged',
     'ExpressRouteCircuitAuthorizationPaged',
     'ExpressRouteCircuitPeeringPaged',
-    'ExpressRouteCircuitArpTablePaged',
-    'ExpressRouteCircuitRoutesTablePaged',
-    'ExpressRouteCircuitStatsPaged',
     'ExpressRouteCircuitPaged',
     'ExpressRouteServiceProviderPaged',
     'LoadBalancerPaged',
@@ -244,11 +246,11 @@
     'ExpressRouteCircuitSkuTier',
     'ExpressRouteCircuitSkuFamily',
     'ServiceProviderProvisioningState',
-    'RouteNextHopType',
     'SecurityRuleProtocol',
     'SecurityRuleAccess',
     'SecurityRuleDirection',
     'TransportProtocol',
+    'RouteNextHopType',
     'LoadDistribution',
     'ProbeProtocol',
     'VirtualNetworkGatewayType',

diff --git a/azure-mgmt-network/azure/mgmt/network/models/express_route_circuit.py b/azure-mgmt-network/azure/mgmt/network/models/express_route_circuit.py
@@ -39,6 +39,8 @@ class ExpressRouteCircuit(Resource):
     :param sku: Gets or sets sku
     :type sku: :class:`ExpressRouteCircuitSku
      <azure.mgmt.network.models.ExpressRouteCircuitSku>`
+    :param allow_classic_operations: allow classic operations
+    :type allow_classic_operations: bool
     :param circuit_provisioning_state: Gets or sets CircuitProvisioningState
      state of the resource
     :type circuit_provisioning_state: str
@@ -76,6 +78,7 @@ class ExpressRouteCircuit(Resource):
         'location': {'key': 'location', 'type': 'str'},
         'tags': {'key': 'tags', 'type': '{str}'},
         'sku': {'key': 'sku', 'type': 'ExpressRouteCircuitSku'},
+        'allow_classic_operations': {'key': 'properties.allowClassicOperations', 'type': 'bool'},
         'circuit_provisioning_state': {'key': 'properties.circuitProvisioningState', 'type': 'str'},
         'service_provider_provisioning_state': {'key': 'properties.serviceProviderProvisioningState', 'type': 'ServiceProviderProvisioningState'},
         'authorizations': {'key': 'properties.authorizations', 'type': '[ExpressRouteCircuitAuthorization]'},
@@ -87,9 +90,10 @@ class ExpressRouteCircuit(Resource):
         'etag': {'key': 'etag', 'type': 'str'},
     }
 
-    def __init__(self, id=None, name=None, type=None, location=None, tags=None, sku=None, circuit_provisioning_state=None, service_provider_provisioning_state=None, authorizations=None, peerings=None, service_key=None, service_provider_notes=None, service_provider_properties=None, provisioning_state=None, etag=None, **kwargs):
+    def __init__(self, id=None, name=None, type=None, location=None, tags=None, sku=None, allow_classic_operations=None, circuit_provisioning_state=None, service_provider_provisioning_state=None, authorizations=None, peerings=None, service_key=None, service_provider_notes=None, service_provider_properties=None, provisioning_state=None, etag=None, **kwargs):
         super(ExpressRouteCircuit, self).__init__(id=id, name=name, type=type, location=location, tags=tags, **kwargs)
         self.sku = sku
+        self.allow_classic_operations = allow_classic_operations
         self.circuit_provisioning_state = circuit_provisioning_state
         self.service_provider_provisioning_state = service_provider_provisioning_state
         self.authorizations = authorizations

diff --git a/azure-mgmt-network/azure/mgmt/network/models/express_route_circuit_arp_table.py b/azure-mgmt-network/azure/mgmt/network/models/express_route_circuit_arp_table.py
@@ -26,17 +26,25 @@ class ExpressRouteCircuitArpTable(Model):
     """
     The arp table associated with the ExpressRouteCircuit
 
+    :param age: Age.
+    :type age: int
+    :param interface: Interface.
+    :type interface: str
     :param ip_address: Gets ipAddress.
     :type ip_address: str
     :param mac_address: Gets macAddress.
     :type mac_address: str
     """ 
 
     _attribute_map = {
+        'age': {'key': 'age', 'type': 'int'},
+        'interface': {'key': 'interface', 'type': 'str'},
         'ip_address': {'key': 'ipAddress', 'type': 'str'},
         'mac_address': {'key': 'macAddress', 'type': 'str'},
     }
 
-    def __init__(self, ip_address=None, mac_address=None, **kwargs):
+    def __init__(self, age=None, interface=None, ip_address=None, mac_address=None, **kwargs):
+        self.age = age
+        self.interface = interface
         self.ip_address = ip_address
         self.mac_address = mac_address
diff --git a/azure-mgmt-network/azure/mgmt/network/models/express_route_circuit_routes_table.py b/azure-mgmt-network/azure/mgmt/network/models/express_route_circuit_routes_table.py
@@ -26,31 +26,29 @@ class ExpressRouteCircuitRoutesTable(Model):
     """
     The routes table associated with the ExpressRouteCircuit
 
-    :param address_prefix: Gets AddressPrefix.
-    :type address_prefix: str
-    :param next_hop_type: Gets NextHopType. Possible values include:
-     'VirtualNetworkGateway', 'VnetLocal', 'Internet', 'VirtualAppliance',
-     'None'
-    :type next_hop_type: str
-    :param next_hop_ip: Gets NextHopIP.
-    :type next_hop_ip: str
-    :param as_path: Gets AsPath.
-    :type as_path: str
+    :param network: network.
+    :type network: str
+    :param next_hop: nextHop
+    :type next_hop: str
+    :param loc_prf: locPrf.
+    :type loc_prf: str
+    :param weight: weight.
+    :type weight: int
+    :param path: path .
+    :type path: str
     """ 
 
-    _validation = {
-        'next_hop_type': {'required': True},
-    }
-
     _attribute_map = {
-        'address_prefix': {'key': 'addressPrefix', 'type': 'str'},
-        'next_hop_type': {'key': 'nextHopType', 'type': 'RouteNextHopType'},
-        'next_hop_ip': {'key': 'nextHopIP', 'type': 'str'},
-        'as_path': {'key': 'asPath', 'type': 'str'},
+        'network': {'key': 'network', 'type': 'str'},
+        'next_hop': {'key': 'nextHop', 'type': 'str'},
+        'loc_prf': {'key': 'locPrf', 'type': 'str'},
+        'weight': {'key': 'weight', 'type': 'int'},
+        'path': {'key': 'path', 'type': 'str'},
     }
 
-    def __init__(self, next_hop_type, address_prefix=None, next_hop_ip=None, as_path=None, **kwargs):
-        self.address_prefix = address_prefix
-        self.next_hop_type = next_hop_type
-        self.next_hop_ip = next_hop_ip
-        self.as_path = as_path
+    def __init__(self, network=None, next_hop=None, loc_prf=None, weight=None, path=None, **kwargs):
+        self.network = network
+        self.next_hop = next_hop
+        self.loc_prf = loc_prf
+        self.weight = weight
+        self.path = path
diff --git a/azure-mgmt-network/azure/mgmt/network/models/express_route_circuit_routes_table_summary.py b/azure-mgmt-network/azure/mgmt/network/models/express_route_circuit_routes_table_summary.py
@@ -0,0 +1,56 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft and contributors.  All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# 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 ExpressRouteCircuitRoutesTableSummary(Model):
+    """
+    The routes table associated with the ExpressRouteCircuit
+
+    :param neighbor: Neighbor.
+    :type neighbor: str
+    :param v: BGP version number spoken to the neighbor.
+    :type v: int
+    :param as_property: Autonomous system number.
+    :type as_property: int
+    :param up_down: The length of time that the BGP session has been in the
+     Established state, or the current status if not in the Established state.
+    :type up_down: str
+    :param state_pfx_rcd: Current state of the BGP session, and the number of
+     prefixes that have been received from a neighbor or peer group.
+    :type state_pfx_rcd: str
+    """ 
+
+    _attribute_map = {
+        'neighbor': {'key': 'neighbor', 'type': 'str'},
+        'v': {'key': 'v', 'type': 'int'},
+        'as_property': {'key': 'as', 'type': 'int'},
+        'up_down': {'key': 'upDown', 'type': 'str'},
+        'state_pfx_rcd': {'key': 'statePfxRcd', 'type': 'str'},
+    }
+
+    def __init__(self, neighbor=None, v=None, as_property=None, up_down=None, state_pfx_rcd=None, **kwargs):
+        self.neighbor = neighbor
+        self.v = v
+        self.as_property = as_property
+        self.up_down = up_down
+        self.state_pfx_rcd = state_pfx_rcd
diff --git a/azure-mgmt-network/azure/mgmt/network/models/express_route_circuit_stats.py b/azure-mgmt-network/azure/mgmt/network/models/express_route_circuit_stats.py
@@ -26,17 +26,25 @@ class ExpressRouteCircuitStats(Model):
     """
     Contains Stats associated with the peering
 
-    :param bytes_in: Gets BytesIn of the peering.
-    :type bytes_in: int
-    :param bytes_out: Gets BytesOut of the peering.
-    :type bytes_out: int
+    :param primarybytes_in: Gets BytesIn of the peering.
+    :type primarybytes_in: int
+    :param primarybytes_out: Gets BytesOut of the peering.
+    :type primarybytes_out: int
+    :param secondarybytes_in: Gets BytesIn of the peering.
+    :type secondarybytes_in: int
+    :param secondarybytes_out: Gets BytesOut of the peering.
+    :type secondarybytes_out: int
     """ 
 
     _attribute_map = {
-        'bytes_in': {'key': 'bytesIn', 'type': 'int'},
-        'bytes_out': {'key': 'bytesOut', 'type': 'int'},
+        'primarybytes_in': {'key': 'primarybytesIn', 'type': 'int'},
+        'primarybytes_out': {'key': 'primarybytesOut', 'type': 'int'},
+        'secondarybytes_in': {'key': 'secondarybytesIn', 'type': 'int'},
+        'secondarybytes_out': {'key': 'secondarybytesOut', 'type': 'int'},
     }
 
-    def __init__(self, bytes_in=None, bytes_out=None, **kwargs):
-        self.bytes_in = bytes_in
-        self.bytes_out = bytes_out
+    def __init__(self, primarybytes_in=None, primarybytes_out=None, secondarybytes_in=None, secondarybytes_out=None, **kwargs):
+        self.primarybytes_in = primarybytes_in
+        self.primarybytes_out = primarybytes_out
+        self.secondarybytes_in = secondarybytes_in
+        self.secondarybytes_out = secondarybytes_out
diff --git a/azure-mgmt-network/azure/mgmt/network/models/express_route_circuits_arp_table_list_result.py b/azure-mgmt-network/azure/mgmt/network/models/express_route_circuits_arp_table_list_result.py
@@ -0,0 +1,43 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft and contributors.  All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# 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 ExpressRouteCircuitsArpTableListResult(Model):
+    """
+    Response for ListArpTable associated with the Express Route Circuits Api
+
+    :param value: Gets List of ArpTable
+    :type value: list of :class:`ExpressRouteCircuitArpTable
+     <azure.mgmt.network.models.ExpressRouteCircuitArpTable>`
+    :param next_link: Gets the URL to get the next set of results.
+    :type next_link: str
+    """ 
+
+    _attribute_map = {
+        'value': {'key': 'value', 'type': '[ExpressRouteCircuitArpTable]'},
+        'next_link': {'key': 'nextLink', 'type': 'str'},
+    }
+
+    def __init__(self, value=None, next_link=None, **kwargs):
+        self.value = value
+        self.next_link = next_link