From ae0f298ae4ca0c50104a4cf9cb3d3570ab66f72a Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Tue, 11 Sep 2018 22:40:05 +0000 Subject: [PATCH 1/2] Generated from 37a648d4d8bbc6b77cc7cbc25b55f95f0b65b9fa NetApp adding subnetId to volume properties --- azure-mgmt-netapp/azure/mgmt/netapp/models/volume.py | 5 +++++ azure-mgmt-netapp/azure/mgmt/netapp/models/volume_py3.py | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/volume.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/volume.py index 0c2a513961de..0326cf38a2f2 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/models/volume.py +++ b/azure-mgmt-netapp/azure/mgmt/netapp/models/volume.py @@ -47,6 +47,9 @@ class Volume(Model): :type usage_threshold: long :ivar provisioning_state: Azure lifecycle management :vartype provisioning_state: str + :param subnet_id: The Azure Resource URI for a delegated subnet. Must have + the delegation Microsoft.NetApp/volumes + :type subnet_id: str """ _validation = { @@ -73,6 +76,7 @@ class Volume(Model): 'service_level': {'key': 'properties.serviceLevel', 'type': 'str'}, 'usage_threshold': {'key': 'properties.usageThreshold', 'type': 'long'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'subnet_id': {'key': 'properties.subnetId', 'type': 'str'}, } def __init__(self, **kwargs): @@ -88,3 +92,4 @@ def __init__(self, **kwargs): self.service_level = kwargs.get('service_level', "Standard") self.usage_threshold = kwargs.get('usage_threshold', 0) self.provisioning_state = None + self.subnet_id = kwargs.get('subnet_id', None) diff --git a/azure-mgmt-netapp/azure/mgmt/netapp/models/volume_py3.py b/azure-mgmt-netapp/azure/mgmt/netapp/models/volume_py3.py index 6fe5d78caa18..6e629373d946 100644 --- a/azure-mgmt-netapp/azure/mgmt/netapp/models/volume_py3.py +++ b/azure-mgmt-netapp/azure/mgmt/netapp/models/volume_py3.py @@ -47,6 +47,9 @@ class Volume(Model): :type usage_threshold: long :ivar provisioning_state: Azure lifecycle management :vartype provisioning_state: str + :param subnet_id: The Azure Resource URI for a delegated subnet. Must have + the delegation Microsoft.NetApp/volumes + :type subnet_id: str """ _validation = { @@ -73,9 +76,10 @@ class Volume(Model): 'service_level': {'key': 'properties.serviceLevel', 'type': 'str'}, 'usage_threshold': {'key': 'properties.usageThreshold', 'type': 'long'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'subnet_id': {'key': 'properties.subnetId', 'type': 'str'}, } - def __init__(self, *, location: str, creation_token: str, tags=None, name1: str=None, service_level="Standard", usage_threshold: int=0, **kwargs) -> None: + def __init__(self, *, location: str, creation_token: str, tags=None, name1: str=None, service_level="Standard", usage_threshold: int=0, subnet_id: str=None, **kwargs) -> None: super(Volume, self).__init__(**kwargs) self.location = location self.id = None @@ -88,3 +92,4 @@ def __init__(self, *, location: str, creation_token: str, tags=None, name1: str= self.service_level = service_level self.usage_threshold = usage_threshold self.provisioning_state = None + self.subnet_id = subnet_id From 6f5f7515eeff535a2222ebab90651a760f0d1b70 Mon Sep 17 00:00:00 2001 From: azuresdkci Date: Tue, 11 Sep 2018 22:53:44 +0000 Subject: [PATCH 2/2] Packaging update of azure-mgmt-netapp --- azure-mgmt-netapp/HISTORY.rst | 9 +++ azure-mgmt-netapp/MANIFEST.in | 2 + azure-mgmt-netapp/README.rst | 49 ++++++++++++++ azure-mgmt-netapp/azure/__init__.py | 1 + azure-mgmt-netapp/azure/mgmt/__init__.py | 1 + azure-mgmt-netapp/azure_bdist_wheel.py | 54 +++++++++++++++ azure-mgmt-netapp/sdk_packaging.toml | 6 ++ azure-mgmt-netapp/setup.cfg | 3 + azure-mgmt-netapp/setup.py | 86 ++++++++++++++++++++++++ 9 files changed, 211 insertions(+) create mode 100644 azure-mgmt-netapp/HISTORY.rst create mode 100644 azure-mgmt-netapp/MANIFEST.in create mode 100644 azure-mgmt-netapp/README.rst create mode 100644 azure-mgmt-netapp/azure/__init__.py create mode 100644 azure-mgmt-netapp/azure/mgmt/__init__.py create mode 100644 azure-mgmt-netapp/azure_bdist_wheel.py create mode 100644 azure-mgmt-netapp/sdk_packaging.toml create mode 100644 azure-mgmt-netapp/setup.cfg create mode 100644 azure-mgmt-netapp/setup.py diff --git a/azure-mgmt-netapp/HISTORY.rst b/azure-mgmt-netapp/HISTORY.rst new file mode 100644 index 000000000000..8924d5d6c445 --- /dev/null +++ b/azure-mgmt-netapp/HISTORY.rst @@ -0,0 +1,9 @@ +.. :changelog: + +Release History +=============== + +0.1.0 (1970-01-01) +++++++++++++++++++ + +* Initial Release diff --git a/azure-mgmt-netapp/MANIFEST.in b/azure-mgmt-netapp/MANIFEST.in new file mode 100644 index 000000000000..9ecaeb15de50 --- /dev/null +++ b/azure-mgmt-netapp/MANIFEST.in @@ -0,0 +1,2 @@ +include *.rst +include azure_bdist_wheel.py \ No newline at end of file diff --git a/azure-mgmt-netapp/README.rst b/azure-mgmt-netapp/README.rst new file mode 100644 index 000000000000..45de4e6b43dd --- /dev/null +++ b/azure-mgmt-netapp/README.rst @@ -0,0 +1,49 @@ +Microsoft Azure SDK for Python +============================== + +This is the Microsoft Azure MyService Management Client Library. + +Azure Resource Manager (ARM) is the next generation of management APIs that +replace the old Azure Service Management (ASM). + +This package has been tested with Python 2.7, 3.4, 3.5, 3.6 and 3.7. + +For the older Azure Service Management (ASM) libraries, see +`azure-servicemanagement-legacy `__ library. + +For a more complete set of Azure libraries, see the `azure `__ bundle package. + + +Compatibility +============= + +**IMPORTANT**: If you have an earlier version of the azure package +(version < 1.0), you should uninstall it before installing this package. + +You can check the version using pip: + +.. code:: shell + + pip freeze + +If you see azure==0.11.0 (or any version below 1.0), uninstall it first: + +.. code:: shell + + pip uninstall azure + + +Usage +===== + +For code examples, see `MyService Management +`__ +on docs.microsoft.com. + + +Provide Feedback +================ + +If you encounter any bugs or have suggestions, please file an issue in the +`Issues `__ +section of the project. diff --git a/azure-mgmt-netapp/azure/__init__.py b/azure-mgmt-netapp/azure/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/azure-mgmt-netapp/azure/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/azure-mgmt-netapp/azure/mgmt/__init__.py b/azure-mgmt-netapp/azure/mgmt/__init__.py new file mode 100644 index 000000000000..de40ea7ca058 --- /dev/null +++ b/azure-mgmt-netapp/azure/mgmt/__init__.py @@ -0,0 +1 @@ +__import__('pkg_resources').declare_namespace(__name__) diff --git a/azure-mgmt-netapp/azure_bdist_wheel.py b/azure-mgmt-netapp/azure_bdist_wheel.py new file mode 100644 index 000000000000..8a81d1b61775 --- /dev/null +++ b/azure-mgmt-netapp/azure_bdist_wheel.py @@ -0,0 +1,54 @@ +#------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +#-------------------------------------------------------------------------- + +from distutils import log as logger +import os.path + +from wheel.bdist_wheel import bdist_wheel +class azure_bdist_wheel(bdist_wheel): + """The purpose of this class is to build wheel a little differently than the sdist, + without requiring to build the wheel from the sdist (i.e. you can build the wheel + directly from source). + """ + + description = "Create an Azure wheel distribution" + + user_options = bdist_wheel.user_options + \ + [('azure-namespace-package=', None, + "Name of the deepest nspkg used")] + + def initialize_options(self): + bdist_wheel.initialize_options(self) + self.azure_namespace_package = None + + def finalize_options(self): + bdist_wheel.finalize_options(self) + if self.azure_namespace_package and not self.azure_namespace_package.endswith("-nspkg"): + raise ValueError("azure_namespace_package must finish by -nspkg") + + def run(self): + if not self.distribution.install_requires: + self.distribution.install_requires = [] + self.distribution.install_requires.append( + "{}>=2.0.0".format(self.azure_namespace_package)) + bdist_wheel.run(self) + + def write_record(self, bdist_dir, distinfo_dir): + if self.azure_namespace_package: + # Split and remove last part, assuming it's "nspkg" + subparts = self.azure_namespace_package.split('-')[0:-1] + folder_with_init = [os.path.join(*subparts[0:i+1]) for i in range(len(subparts))] + for azure_sub_package in folder_with_init: + init_file = os.path.join(bdist_dir, azure_sub_package, '__init__.py') + if os.path.isfile(init_file): + logger.info("manually remove {} while building the wheel".format(init_file)) + os.remove(init_file) + else: + raise ValueError("Unable to find {}. Are you sure of your namespace package?".format(init_file)) + bdist_wheel.write_record(self, bdist_dir, distinfo_dir) +cmdclass = { + 'bdist_wheel': azure_bdist_wheel, +} diff --git a/azure-mgmt-netapp/sdk_packaging.toml b/azure-mgmt-netapp/sdk_packaging.toml new file mode 100644 index 000000000000..9c3b943d9ab4 --- /dev/null +++ b/azure-mgmt-netapp/sdk_packaging.toml @@ -0,0 +1,6 @@ +[packaging] +package_name = "azure-mgmt-netapp" +package_pprint_name = "MyService Management" +package_doc_id = "" +is_stable = false +is_arm = true diff --git a/azure-mgmt-netapp/setup.cfg b/azure-mgmt-netapp/setup.cfg new file mode 100644 index 000000000000..856f4164982c --- /dev/null +++ b/azure-mgmt-netapp/setup.cfg @@ -0,0 +1,3 @@ +[bdist_wheel] +universal=1 +azure-namespace-package=azure-mgmt-nspkg \ No newline at end of file diff --git a/azure-mgmt-netapp/setup.py b/azure-mgmt-netapp/setup.py new file mode 100644 index 000000000000..2571650684fd --- /dev/null +++ b/azure-mgmt-netapp/setup.py @@ -0,0 +1,86 @@ +#!/usr/bin/env python + +#------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +#-------------------------------------------------------------------------- + +import re +import os.path +from io import open +from setuptools import find_packages, setup +try: + from azure_bdist_wheel import cmdclass +except ImportError: + from distutils import log as logger + logger.warn("Wheel is not available, disabling bdist_wheel hook") + cmdclass = {} + +# Change the PACKAGE_NAME only to change folder and different name +PACKAGE_NAME = "azure-mgmt-netapp" +PACKAGE_PPRINT_NAME = "MyService Management" + +# a-b-c => a/b/c +package_folder_path = PACKAGE_NAME.replace('-', '/') +# a-b-c => a.b.c +namespace_name = PACKAGE_NAME.replace('-', '.') + +# azure v0.x is not compatible with this package +# azure v0.x used to have a __version__ attribute (newer versions don't) +try: + import azure + try: + ver = azure.__version__ + raise Exception( + 'This package is incompatible with azure=={}. '.format(ver) + + 'Uninstall it with "pip uninstall azure".' + ) + except AttributeError: + pass +except ImportError: + pass + +# Version extraction inspired from 'requests' +with open(os.path.join(package_folder_path, 'version.py'), 'r') as fd: + version = re.search(r'^VERSION\s*=\s*[\'"]([^\'"]*)[\'"]', + fd.read(), re.MULTILINE).group(1) + +if not version: + raise RuntimeError('Cannot find version information') + +with open('README.rst', encoding='utf-8') as f: + readme = f.read() +with open('HISTORY.rst', encoding='utf-8') as f: + history = f.read() + +setup( + name=PACKAGE_NAME, + version=version, + description='Microsoft Azure {} Client Library for Python'.format(PACKAGE_PPRINT_NAME), + long_description=readme + '\n\n' + history, + license='MIT License', + author='Microsoft Corporation', + author_email='azpysdkhelp@microsoft.com', + url='https://github.com/Azure/azure-sdk-for-python', + classifiers=[ + 'Development Status :: 4 - Beta', + 'Programming Language :: Python', + 'Programming Language :: Python :: 2', + 'Programming Language :: Python :: 2.7', + 'Programming Language :: Python :: 3', + 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + 'License :: OSI Approved :: MIT License', + ], + zip_safe=False, + packages=find_packages(exclude=["tests"]), + install_requires=[ + 'msrest>=0.5.0', + 'msrestazure>=0.4.32,<2.0.0', + 'azure-common~=1.1', + ], + cmdclass=cmdclass +)