Merge branch 'master' into keyvault_data

azure-batch/setup.py

@@ -7,7 +7,7 @@
 #--------------------------------------------------------------------------
 
 from setuptools import find_packages, setup
-from codecs import open
+from io import open
 import re
 import os.path
 
@@ -43,9 +43,9 @@
 if not version:
     raise RuntimeError('Cannot find version information')
 
-with open('README.rst', 'r', 'utf-8') as f:
+with open('README.rst', encoding='utf-8') as f:
     readme = f.read()
-with open('HISTORY.rst', 'r', 'utf-8') as f:
+with open('HISTORY.rst', encoding='utf-8') as f:
     history = f.read()
 
 setup(

azure-graphrbac/setup.py

@@ -7,7 +7,7 @@
 #--------------------------------------------------------------------------
 
 from setuptools import setup
-from codecs import open
+from io import open
 import re
 
 # azure v0.x is not compatible with this package
@@ -33,9 +33,9 @@
 if not version:
     raise RuntimeError('Cannot find version information')
 
-with open('README.rst', 'r', 'utf-8') as f:
+with open('README.rst', encoding='utf-8') as f:
     readme = f.read()
-with open('HISTORY.rst', 'r', 'utf-8') as f:
+with open('HISTORY.rst', encoding='utf-8') as f:
     history = f.read()
 
 setup(

azure-keyvault/setup.py

@@ -7,7 +7,7 @@
 #--------------------------------------------------------------------------
 
 from setuptools import find_packages, setup
-from codecs import open
+from io import open
 import re
 import os.path
 
@@ -43,9 +43,9 @@
 if not version:
     raise RuntimeError('Cannot find version information')
 
-with open('README.rst', 'r', 'utf-8') as f:
+with open('README.rst', encoding='utf-8') as f:
     readme = f.read()
-with open('HISTORY.rst', 'r', 'utf-8') as f:
+with open('HISTORY.rst', encoding='utf-8') as f:
     history = f.read()
 
 setup(

azure-mgmt-batch/setup.py

@@ -7,7 +7,7 @@
 #--------------------------------------------------------------------------
 
 from setuptools import find_packages, setup
-from codecs import open
+from io import open
 import re
 import os.path
 
@@ -43,9 +43,9 @@
 if not version:
     raise RuntimeError('Cannot find version information')
 
-with open('README.rst', 'r', 'utf-8') as f:
+with open('README.rst', encoding='utf-8') as f:
     readme = f.read()
-with open('HISTORY.rst', 'r', 'utf-8') as f:
+with open('HISTORY.rst', encoding='utf-8') as f:
     history = f.read()
 
 setup(

azure-mgmt-compute/HISTORY.rst

@@ -3,6 +3,11 @@
 Release History
 ===============
 
+0.30.0 (2016-10-17)
++++++++++++++++++++
+
+* Initial preview release. Based on API version 2016-03-30.
+
 
 0.20.0 (2015-08-31)
 +++++++++++++++++++

azure-mgmt-compute/azure/mgmt/compute/models/additional_unattend_content.py

@@ -32,7 +32,7 @@ class AdditionalUnattendContent(Model):
     :type setting_name: str or :class:`SettingNames
      <azure.mgmt.compute.models.SettingNames>`
     :param content: XML formatted content that is added to the unattend.xml
-     file in the specified pass and component.The XML must be less than 4 KB
+     file in the specified pass and component. The XML must be less than 4 KB
      and must include the root element for the setting or feature that is
      being inserted.
     :type content: str

azure-mgmt-compute/azure/mgmt/compute/models/data_disk.py

@@ -23,7 +23,7 @@ class DataDisk(Model):
     :type vhd: :class:`VirtualHardDisk
      <azure.mgmt.compute.models.VirtualHardDisk>`
     :param image: the Source User Image VirtualHardDisk. This VirtualHardDisk
-     will be copied before using it to attach to the Virtual Machine.If
+     will be copied before using it to attach to the Virtual Machine. If
      SourceImage is provided, the destination VirtualHardDisk should not
      exist.
     :type image: :class:`VirtualHardDisk

azure-mgmt-compute/azure/mgmt/compute/models/data_disk_image.py

@@ -18,9 +18,9 @@ class DataDiskImage(Model):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar lun: the LUN number for a data disk.This value is used to identify
+    :ivar lun: the LUN number for a data disk. This value is used to identify
      data disk image inside the VMImage therefore it must be unique for each
-     data disk.The allowed character for the value is digit.
+     data disk. The allowed character for the value is digit.
     :vartype lun: int
     """ 
 

azure-mgmt-compute/azure/mgmt/compute/models/os_disk.py

@@ -28,7 +28,7 @@ class OSDisk(Model):
     :type vhd: :class:`VirtualHardDisk
      <azure.mgmt.compute.models.VirtualHardDisk>`
     :param image: the Source User Image VirtualHardDisk. This VirtualHardDisk
-     will be copied before using it to attach to the Virtual Machine.If
+     will be copied before using it to attach to the Virtual Machine. If
      SourceImage is provided, the destination VirtualHardDisk should not
      exist.
     :type image: :class:`VirtualHardDisk

azure-mgmt-compute/azure/mgmt/compute/models/resource.py

@@ -13,7 +13,7 @@
 
 
 class Resource(Model):
-    """Resource.
+    """The Resource model definition.
 
     Variables are only populated by the server, and will be ignored when
     sending a request.

azure-mgmt-compute/azure/mgmt/compute/models/ssh_public_key.py

@@ -21,7 +21,7 @@ class SshPublicKey(Model):
      file.
     :type path: str
     :param key_data: Certificate public key used to authenticate with VM
-     through SSH.The certificate must be in Pem format with or without
+     through SSH. The certificate must be in Pem format with or without
      headers.
     :type key_data: str
     """ 

azure-mgmt-compute/azure/mgmt/compute/models/virtual_machine_extension_image.py

@@ -37,7 +37,7 @@ class VirtualMachineExtensionImage(Resource):
      consumers should provide settings in a matching schema.
     :type handler_schema: str
     :param vm_scale_set_enabled: whether the extension can be used on xRP
-     VMScaleSets.By default existing extensions are usable on scalesets, but
+     VMScaleSets. By default existing extensions are usable on scalesets, but
      there might be cases where a publisher wants to explicitly indicate the
      extension is only enabled for CRP VMs but not VMSS.
     :type vm_scale_set_enabled: bool

azure-mgmt-compute/azure/mgmt/compute/models/virtual_machine_scale_set.py

@@ -39,9 +39,9 @@ class VirtualMachineScaleSet(Resource):
     :ivar provisioning_state: the provisioning state, which only appears in
      the response.
     :vartype provisioning_state: str
-    :param over_provision: Specifies whether the Virtual Machine Scale Set
+    :param overprovision: Specifies whether the Virtual Machine Scale Set
      should be overprovisioned.
-    :type over_provision: bool
+    :type overprovision: bool
     """ 
 
     _validation = {
@@ -62,13 +62,13 @@ class VirtualMachineScaleSet(Resource):
         'upgrade_policy': {'key': 'properties.upgradePolicy', 'type': 'UpgradePolicy'},
         'virtual_machine_profile': {'key': 'properties.virtualMachineProfile', 'type': 'VirtualMachineScaleSetVMProfile'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
-        'over_provision': {'key': 'properties.overProvision', 'type': 'bool'},
+        'overprovision': {'key': 'properties.overprovision', 'type': 'bool'},
     }
 
-    def __init__(self, location, tags=None, sku=None, upgrade_policy=None, virtual_machine_profile=None, over_provision=None):
+    def __init__(self, location, tags=None, sku=None, upgrade_policy=None, virtual_machine_profile=None, overprovision=None):
         super(VirtualMachineScaleSet, self).__init__(location=location, tags=tags)
         self.sku = sku
         self.upgrade_policy = upgrade_policy
         self.virtual_machine_profile = virtual_machine_profile
         self.provisioning_state = None
-        self.over_provision = over_provision
+        self.overprovision = overprovision

azure-mgmt-compute/azure/mgmt/compute/models/virtual_machine_scale_set_os_disk.py

@@ -30,7 +30,7 @@ class VirtualMachineScaleSetOSDisk(Model):
     :type os_type: str or :class:`OperatingSystemTypes
      <azure.mgmt.compute.models.OperatingSystemTypes>`
     :param image: the Source User Image VirtualHardDisk. This VirtualHardDisk
-     will be copied before using it to attach to the Virtual Machine.If
+     will be copied before using it to attach to the Virtual Machine. If
      SourceImage is provided, the destination VirtualHardDisk should not
      exist.
     :type image: :class:`VirtualHardDisk

azure-mgmt-compute/azure/mgmt/compute/version.py

@@ -9,5 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "0.30.0rc6"
+VERSION = "0.30.0"
 

azure-mgmt-compute/setup.py

@@ -7,7 +7,7 @@
 #--------------------------------------------------------------------------
 
 from setuptools import setup
-from codecs import open
+from io import open
 import re
 
 # azure v0.x is not compatible with this package
@@ -33,9 +33,9 @@
 if not version:
     raise RuntimeError('Cannot find version information')
 
-with open('README.rst', 'r', 'utf-8') as f:
+with open('README.rst', encoding='utf-8') as f:
     readme = f.read()
-with open('HISTORY.rst', 'r', 'utf-8') as f:
+with open('HISTORY.rst', encoding='utf-8') as f:
     history = f.read()
 
 setup(

azure-mgmt-devtestlabs/setup.py

@@ -7,7 +7,7 @@
 #--------------------------------------------------------------------------
 
 from setuptools import find_packages, setup
-from codecs import open
+from io import open
 import re
 import os.path
 
@@ -43,9 +43,9 @@
 if not version:
     raise RuntimeError('Cannot find version information')
 
-with open('README.rst', 'r', 'utf-8') as f:
+with open('README.rst', encoding='utf-8') as f:
     readme = f.read()
-with open('HISTORY.rst', 'r', 'utf-8') as f:
+with open('HISTORY.rst', encoding='utf-8') as f:
     history = f.read()
 
 setup(

azure-mgmt-iothub/setup.py

@@ -7,7 +7,7 @@
 #--------------------------------------------------------------------------
 
 from setuptools import find_packages, setup
-from codecs import open
+from io import open
 import re
 import os.path
 
@@ -43,9 +43,9 @@
 if not version:
     raise RuntimeError('Cannot find version information')
 
-with open('README.rst', 'r', 'utf-8') as f:
+with open('README.rst', encoding='utf-8') as f:
     readme = f.read()
-with open('HISTORY.rst', 'r', 'utf-8') as f:
+with open('HISTORY.rst', encoding='utf-8') as f:
     history = f.read()
 
 setup(

azure-mgmt-logic/setup.py

@@ -7,7 +7,7 @@
 #--------------------------------------------------------------------------
 
 from setuptools import setup
-from codecs import open
+from io import open
 import re
 
 # azure v0.x is not compatible with this package
@@ -33,9 +33,9 @@
 if not version:
     raise RuntimeError('Cannot find version information')
 
-with open('README.rst', 'r', 'utf-8') as f:
+with open('README.rst', encoding='utf-8') as f:
     readme = f.read()
-with open('HISTORY.rst', 'r', 'utf-8') as f:
+with open('HISTORY.rst', encoding='utf-8') as f:
     history = f.read()
 
 setup(

azure-mgmt-network/setup.py

@@ -7,7 +7,7 @@
 #--------------------------------------------------------------------------
 
 from setuptools import setup
-from codecs import open
+from io import open
 import re
 
 # azure v0.x is not compatible with this package
@@ -33,9 +33,9 @@
 if not version:
     raise RuntimeError('Cannot find version information')
 
-with open('README.rst', 'r', 'utf-8') as f:
+with open('README.rst', encoding='utf-8') as f:
     readme = f.read()
-with open('HISTORY.rst', 'r', 'utf-8') as f:
+with open('HISTORY.rst', encoding='utf-8') as f:
     history = f.read()
 
 setup(

azure-mgmt-notificationhubs/azure/mgmt/notificationhubs/models/__init__.py

@@ -10,69 +10,63 @@
 # --------------------------------------------------------------------------
 
 from .check_availability_parameters import CheckAvailabilityParameters
-from .check_availability_resource import CheckAvailabilityResource
-from .namespace_properties import NamespaceProperties
+from .sku import Sku
+from .check_availability_result import CheckAvailabilityResult
 from .namespace_create_or_update_parameters import NamespaceCreateOrUpdateParameters
+from .namespace_patch_parameters import NamespacePatchParameters
 from .namespace_resource import NamespaceResource
 from .shared_access_authorization_rule_properties import SharedAccessAuthorizationRuleProperties
 from .shared_access_authorization_rule_create_or_update_parameters import SharedAccessAuthorizationRuleCreateOrUpdateParameters
 from .shared_access_authorization_rule_resource import SharedAccessAuthorizationRuleResource
 from .resource_list_keys import ResourceListKeys
-from .apns_credential_properties import ApnsCredentialProperties
+from .policykey_resource import PolicykeyResource
 from .apns_credential import ApnsCredential
-from .wns_credential_properties import WnsCredentialProperties
 from .wns_credential import WnsCredential
-from .gcm_credential_properties import GcmCredentialProperties
 from .gcm_credential import GcmCredential
-from .mpns_credential_properties import MpnsCredentialProperties
 from .mpns_credential import MpnsCredential
-from .adm_credential_properties import AdmCredentialProperties
 from .adm_credential import AdmCredential
-from .baidu_credential_properties import BaiduCredentialProperties
 from .baidu_credential import BaiduCredential
-from .notification_hub_properties import NotificationHubProperties
 from .notification_hub_create_or_update_parameters import NotificationHubCreateOrUpdateParameters
 from .notification_hub_resource import NotificationHubResource
+from .pns_credentials_resource import PnsCredentialsResource
 from .resource import Resource
 from .sub_resource import SubResource
 from .namespace_resource_paged import NamespaceResourcePaged
 from .shared_access_authorization_rule_resource_paged import SharedAccessAuthorizationRuleResourcePaged
 from .notification_hub_resource_paged import NotificationHubResourcePaged
 from .notification_hubs_management_client_enums import (
+    SkuName,
     NamespaceType,
     AccessRights,
 )
 
 __all__ = [
     'CheckAvailabilityParameters',
-    'CheckAvailabilityResource',
-    'NamespaceProperties',
+    'Sku',
+    'CheckAvailabilityResult',
     'NamespaceCreateOrUpdateParameters',
+    'NamespacePatchParameters',
     'NamespaceResource',
     'SharedAccessAuthorizationRuleProperties',
     'SharedAccessAuthorizationRuleCreateOrUpdateParameters',
     'SharedAccessAuthorizationRuleResource',
     'ResourceListKeys',
-    'ApnsCredentialProperties',
+    'PolicykeyResource',
     'ApnsCredential',
-    'WnsCredentialProperties',
     'WnsCredential',
-    'GcmCredentialProperties',
     'GcmCredential',
-    'MpnsCredentialProperties',
     'MpnsCredential',
-    'AdmCredentialProperties',
     'AdmCredential',
-    'BaiduCredentialProperties',
     'BaiduCredential',
-    'NotificationHubProperties',
     'NotificationHubCreateOrUpdateParameters',
     'NotificationHubResource',
+    'PnsCredentialsResource',
     'Resource',
     'SubResource',
     'NamespaceResourcePaged',
     'SharedAccessAuthorizationRuleResourcePaged',
     'NotificationHubResourcePaged',
+    'SkuName',
     'NamespaceType',
     'AccessRights',
 ]