Skip to content

[AutoPR containerservice/resource-manager] Location is pure ACS - Python #5068

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
AutorestCI merged 1 commit into from
May 3, 2019
Merged

[AutoPR containerservice/resource-manager] Location is pure ACS - Python #5068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions azure-mgmt-containerservice/azure/mgmt/containerservice/container_service_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,13 +150,10 @@ def container_services(self):
"""Instance depends on the API version:

* 2017-07-01: :class:`ContainerServicesOperations<azure.mgmt.containerservice.v2017_07_01.operations.ContainerServicesOperations>`
* 2019-04-30: :class:`ContainerServicesOperations<azure.mgmt.containerservice.v2019_04_30.operations.ContainerServicesOperations>`
"""
api_version = self._get_api_version('container_services')
if api_version == '2017-07-01':
from .v2017_07_01.operations import ContainerServicesOperations as OperationClass
elif api_version == '2019-04-30':
from .v2019_04_30.operations import ContainerServicesOperations 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)))
Expand Down
7 changes: 5 additions & 2 deletions ...t-containerservice/azure/mgmt/containerservice/v2017_07_01/models/orchestrator_profile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,27 @@ class OrchestratorProfile(Model):

All required parameters must be populated in order to send to Azure.

:param orchestrator_type: Required. Orchestrator type.
:param orchestrator_type: Orchestrator type.
:type orchestrator_type: str
:param orchestrator_version: Required. Orchestrator version (major, minor,
patch).
:type orchestrator_version: str
:param is_preview: Whether Kubernetes version is currently in preview.
:type is_preview: bool
"""

_validation = {
'orchestrator_type': {'required': True},
'orchestrator_version': {'required': True},
}

_attribute_map = {
'orchestrator_type': {'key': 'orchestratorType', 'type': 'str'},
'orchestrator_version': {'key': 'orchestratorVersion', 'type': 'str'},
'is_preview': {'key': 'isPreview', 'type': 'bool'},
}

def __init__(self, **kwargs):
super(OrchestratorProfile, self).__init__(**kwargs)
self.orchestrator_type = kwargs.get('orchestrator_type', None)
self.orchestrator_version = kwargs.get('orchestrator_version', None)
self.is_preview = kwargs.get('is_preview', None)
9 changes: 6 additions & 3 deletions ...ntainerservice/azure/mgmt/containerservice/v2017_07_01/models/orchestrator_profile_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,27 @@ class OrchestratorProfile(Model):

All required parameters must be populated in order to send to Azure.

:param orchestrator_type: Required. Orchestrator type.
:param orchestrator_type: Orchestrator type.
:type orchestrator_type: str
:param orchestrator_version: Required. Orchestrator version (major, minor,
patch).
:type orchestrator_version: str
:param is_preview: Whether Kubernetes version is currently in preview.
:type is_preview: bool
"""

_validation = {
'orchestrator_type': {'required': True},
'orchestrator_version': {'required': True},
}

_attribute_map = {
'orchestrator_type': {'key': 'orchestratorType', 'type': 'str'},
'orchestrator_version': {'key': 'orchestratorVersion', 'type': 'str'},
'is_preview': {'key': 'isPreview', 'type': 'bool'},
}

def __init__(self, *, orchestrator_type: str, orchestrator_version: str, **kwargs) -> None:
def __init__(self, *, orchestrator_version: str, orchestrator_type: str=None, is_preview: bool=None, **kwargs) -> None:
super(OrchestratorProfile, self).__init__(**kwargs)
self.orchestrator_type = orchestrator_type
self.orchestrator_version = orchestrator_version
self.is_preview = is_preview
11 changes: 6 additions & 5 deletions ...nerservice/azure/mgmt/containerservice/v2017_07_01/models/orchestrator_version_profile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,25 @@ class OrchestratorVersionProfile(Model):
:param orchestrator_version: Required. Orchestrator version (major, minor,
patch).
:type orchestrator_version: str
:param default: Required. Installed by default if version is not
specified.
:param default: Installed by default if version is not specified.
:type default: bool
:param upgrades: Required. The list of available upgrade versions.
:param is_preview: Whether Kubernetes version is currently in preview.
:type is_preview: bool
:param upgrades: The list of available upgrade versions.
:type upgrades:
list[~azure.mgmt.containerservice.v2017_07_01.models.OrchestratorProfile]
"""

_validation = {
'orchestrator_type': {'required': True},
'orchestrator_version': {'required': True},
'default': {'required': True},
'upgrades': {'required': True},
}

_attribute_map = {
'orchestrator_type': {'key': 'orchestratorType', 'type': 'str'},
'orchestrator_version': {'key': 'orchestratorVersion', 'type': 'str'},
'default': {'key': 'default', 'type': 'bool'},
'is_preview': {'key': 'isPreview', 'type': 'bool'},
'upgrades': {'key': 'upgrades', 'type': '[OrchestratorProfile]'},
}

Expand All @@ -49,4 +49,5 @@ def __init__(self, **kwargs):
self.orchestrator_type = kwargs.get('orchestrator_type', None)
self.orchestrator_version = kwargs.get('orchestrator_version', None)
self.default = kwargs.get('default', None)
self.is_preview = kwargs.get('is_preview', None)
self.upgrades = kwargs.get('upgrades', None)
13 changes: 7 additions & 6 deletions ...ervice/azure/mgmt/containerservice/v2017_07_01/models/orchestrator_version_profile_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,31 +22,32 @@ class OrchestratorVersionProfile(Model):
:param orchestrator_version: Required. Orchestrator version (major, minor,
patch).
:type orchestrator_version: str
:param default: Required. Installed by default if version is not
specified.
:param default: Installed by default if version is not specified.
:type default: bool
:param upgrades: Required. The list of available upgrade versions.
:param is_preview: Whether Kubernetes version is currently in preview.
:type is_preview: bool
:param upgrades: The list of available upgrade versions.
:type upgrades:
list[~azure.mgmt.containerservice.v2017_07_01.models.OrchestratorProfile]
"""

_validation = {
'orchestrator_type': {'required': True},
'orchestrator_version': {'required': True},
'default': {'required': True},
'upgrades': {'required': True},
}

_attribute_map = {
'orchestrator_type': {'key': 'orchestratorType', 'type': 'str'},
'orchestrator_version': {'key': 'orchestratorVersion', 'type': 'str'},
'default': {'key': 'default', 'type': 'bool'},
'is_preview': {'key': 'isPreview', 'type': 'bool'},
'upgrades': {'key': 'upgrades', 'type': '[OrchestratorProfile]'},
}

def __init__(self, *, orchestrator_type: str, orchestrator_version: str, default: bool, upgrades, **kwargs) -> None:
def __init__(self, *, orchestrator_type: str, orchestrator_version: str, default: bool=None, is_preview: bool=None, upgrades=None, **kwargs) -> None:
super(OrchestratorVersionProfile, self).__init__(**kwargs)
self.orchestrator_type = orchestrator_type
self.orchestrator_version = orchestrator_version
self.default = default
self.is_preview = is_preview
self.upgrades = upgrades
7 changes: 4 additions & 3 deletions ...rvice/azure/mgmt/containerservice/v2017_07_01/operations/container_services_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,8 +459,9 @@ def list_orchestrators(
"""Gets a list of supported orchestrators in the specified subscription.

Gets a list of supported orchestrators in the specified subscription.
The operation returns properties of each orchestrator including version
and available upgrades.
The operation returns properties of each orchestrator including
version, available upgrades and whether that version or upgrades are in
preview.

:param location: The name of a supported Azure region.
:type location: str
Expand All @@ -479,7 +480,7 @@ def list_orchestrators(
or ~msrest.pipeline.ClientRawResponse
:raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
"""
api_version = "2017-09-30"
api_version = "2019-04-01"

# Construct URL
url = self.list_orchestrators.metadata['url']
Expand Down
5 changes: 0 additions & 5 deletions ...mgmt-containerservice/azure/mgmt/containerservice/v2019_04_30/container_service_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
from .operations.operations import Operations
from .operations.managed_clusters_operations import ManagedClustersOperations
from .operations.agent_pools_operations import AgentPoolsOperations
from .operations.container_services_operations import ContainerServicesOperations
from . import models


Expand Down Expand Up @@ -69,8 +68,6 @@ class ContainerServiceClient(SDKClient):
:vartype managed_clusters: azure.mgmt.containerservice.v2019_04_30.operations.ManagedClustersOperations
:ivar agent_pools: AgentPools operations
:vartype agent_pools: azure.mgmt.containerservice.v2019_04_30.operations.AgentPoolsOperations
:ivar container_services: ContainerServices operations
:vartype container_services: azure.mgmt.containerservice.v2019_04_30.operations.ContainerServicesOperations

:param credentials: Credentials needed for the client to connect to Azure.
:type credentials: :mod:`A msrestazure Credentials
Expand Down Expand Up @@ -100,5 +97,3 @@ def __init__(
self._client, self.config, self._serialize, self._deserialize)
self.agent_pools = AgentPoolsOperations(
self._client, self.config, self._serialize, self._deserialize)
self.container_services = ContainerServicesOperations(
self._client, self.config, self._serialize, self._deserialize)
9 changes: 0 additions & 9 deletions azure-mgmt-containerservice/azure/mgmt/containerservice/v2019_04_30/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,6 @@
from .managed_cluster_upgrade_profile_py3 import ManagedClusterUpgradeProfile
from .credential_result_py3 import CredentialResult
from .credential_results_py3 import CredentialResults
from .orchestrator_profile_py3 import OrchestratorProfile
from .orchestrator_version_profile_py3 import OrchestratorVersionProfile
from .orchestrator_version_profile_list_result_py3 import OrchestratorVersionProfileListResult
except (SyntaxError, ImportError):
from .resource import Resource
from .purchase_plan import PurchasePlan
Expand Down Expand Up @@ -86,9 +83,6 @@
from .managed_cluster_upgrade_profile import ManagedClusterUpgradeProfile
from .credential_result import CredentialResult
from .credential_results import CredentialResults
from .orchestrator_profile import OrchestratorProfile
from .orchestrator_version_profile import OrchestratorVersionProfile
from .orchestrator_version_profile_list_result import OrchestratorVersionProfileListResult
from .open_shift_managed_cluster_paged import OpenShiftManagedClusterPaged
from .operation_value_paged import OperationValuePaged
from .managed_cluster_paged import ManagedClusterPaged
Expand Down Expand Up @@ -143,9 +137,6 @@
'ManagedClusterUpgradeProfile',
'CredentialResult',
'CredentialResults',
'OrchestratorProfile',
'OrchestratorVersionProfile',
'OrchestratorVersionProfileListResult',
'OpenShiftManagedClusterPaged',
'OperationValuePaged',
'ManagedClusterPaged',
Expand Down
43 changes: 0 additions & 43 deletions ...t-containerservice/azure/mgmt/containerservice/v2019_04_30/models/orchestrator_profile.py
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions ...ntainerservice/azure/mgmt/containerservice/v2019_04_30/models/orchestrator_profile_py3.py
View file
Open in desktop

This file was deleted.

53 changes: 0 additions & 53 deletions ...nerservice/azure/mgmt/containerservice/v2019_04_30/models/orchestrator_version_profile.py
View file
Open in desktop

This file was deleted.

Loading