Skip to content
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.

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

[fleet] update fleet sdk to version 2024-05-02-preview #7781

Merged
merged 4 commits into from
Jul 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/fleet/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,7 @@ Release History
1.1.2
++++++
* Removed preview markings for hub-related parameters.

1.2.0
++++++
* Upgrade SDK version to 2024-05-02-preview
2 changes: 1 addition & 1 deletion src/fleet/azext_fleet/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ def register_fleet_resource_type():
register_resource_type(
"latest",
CUSTOM_MGMT_FLEET,
SDKProfile("2024-02-02-preview"),
SDKProfile("2024-05-02-preview"),
)


Expand Down
2 changes: 1 addition & 1 deletion src/fleet/azext_fleet/azext_metadata.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"azext.isPreview": false,
"azext.minCliCoreVersion": "2.48.0"
"azext.minCliCoreVersion": "2.61.0"
}
11,043 changes: 5,520 additions & 5,523 deletions src/fleet/azext_fleet/tests/latest/recordings/test_fleet_hubful.yaml

Large diffs are not rendered by default.

6,519 changes: 3,186 additions & 3,333 deletions src/fleet/azext_fleet/tests/latest/recordings/test_fleet_hubless.yaml

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def test_fleet_hubless(self):
self.cmd('fleet member wait -g {rg} --fleet-name {fleet_name} --fleet-member-name {member_name} --updated', checks=[self.is_empty()])
self.cmd('aks wait -g {rg} -n {member_name} --updated', checks=[self.is_empty()])

self.cmd('fleet updaterun create -g {rg} -n {updaterun} -f {fleet_name} --upgrade-type Full --node-image-selection Latest --kubernetes-version 1.27.1 --stages {stages_file}', checks=[
self.cmd('fleet updaterun create -g {rg} -n {updaterun} -f {fleet_name} --upgrade-type Full --node-image-selection Latest --kubernetes-version 1.29.2 --stages {stages_file}', checks=[
self.check('name', '{updaterun}')
])

Expand All @@ -147,7 +147,7 @@ def test_fleet_hubless(self):
'update_strategy_name': update_strategy_name,
})

self.cmd('fleet updaterun create -g {rg} -n {updaterun} -f {fleet_name} --upgrade-type Full --node-image-selection Latest --kubernetes-version 1.27.1 --update-strategy-name {update_strategy_name}', checks=[
self.cmd('fleet updaterun create -g {rg} -n {updaterun} -f {fleet_name} --upgrade-type Full --node-image-selection Latest --kubernetes-version 1.29.2 --update-strategy-name {update_strategy_name}', checks=[
self.check('name', '{updaterun}')
])

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class ContainerServiceFleetMgmtClient(MultiApiClientMixin, _SDKClient):
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
"""

DEFAULT_API_VERSION = '2023-10-15'
DEFAULT_API_VERSION = '2024-05-02-preview'
_PROFILE_TAG = "azure.mgmt.containerservicefleet.ContainerServiceFleetMgmtClient"
LATEST_PROFILE = ProfileDefinition({
_PROFILE_TAG: {
Expand Down Expand Up @@ -116,6 +116,8 @@ def models(cls, api_version=DEFAULT_API_VERSION):
* 2023-08-15-preview: :mod:`v2023_08_15_preview.models<azure.mgmt.containerservicefleet.v2023_08_15_preview.models>`
* 2023-10-15: :mod:`v2023_10_15.models<azure.mgmt.containerservicefleet.v2023_10_15.models>`
* 2024-02-02-preview: :mod:`v2024_02_02_preview.models<azure.mgmt.containerservicefleet.v2024_02_02_preview.models>`
* 2024-04-01: :mod:`v2024_04_01.models<azure.mgmt.containerservicefleet.v2024_04_01.models>`
* 2024-05-02-preview: :mod:`v2024_05_02_preview.models<azure.mgmt.containerservicefleet.v2024_05_02_preview.models>`
"""
if api_version == '2022-09-02-preview':
from .v2022_06_02_preview import models
Expand All @@ -141,8 +143,28 @@ def models(cls, api_version=DEFAULT_API_VERSION):
elif api_version == '2024-02-02-preview':
from .v2024_02_02_preview import models
return models
elif api_version == '2024-04-01':
from .v2024_04_01 import models
return models
elif api_version == '2024-05-02-preview':
from .v2024_05_02_preview import models
return models
raise ValueError("API version {} is not available".format(api_version))

@property
def auto_upgrade_profiles(self):
"""Instance depends on the API version:

* 2024-05-02-preview: :class:`AutoUpgradeProfilesOperations<azure.mgmt.containerservicefleet.v2024_05_02_preview.operations.AutoUpgradeProfilesOperations>`
"""
api_version = self._get_api_version('auto_upgrade_profiles')
if api_version == '2024-05-02-preview':
from .v2024_05_02_preview.operations import AutoUpgradeProfilesOperations as OperationClass
else:
raise ValueError("API version {} does not have operation group 'auto_upgrade_profiles'".format(api_version))
self._config.api_version = api_version
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version)

@property
def fleet_members(self):
"""Instance depends on the API version:
Expand All @@ -155,6 +177,8 @@ def fleet_members(self):
* 2023-08-15-preview: :class:`FleetMembersOperations<azure.mgmt.containerservicefleet.v2023_08_15_preview.operations.FleetMembersOperations>`
* 2023-10-15: :class:`FleetMembersOperations<azure.mgmt.containerservicefleet.v2023_10_15.operations.FleetMembersOperations>`
* 2024-02-02-preview: :class:`FleetMembersOperations<azure.mgmt.containerservicefleet.v2024_02_02_preview.operations.FleetMembersOperations>`
* 2024-04-01: :class:`FleetMembersOperations<azure.mgmt.containerservicefleet.v2024_04_01.operations.FleetMembersOperations>`
* 2024-05-02-preview: :class:`FleetMembersOperations<azure.mgmt.containerservicefleet.v2024_05_02_preview.operations.FleetMembersOperations>`
"""
api_version = self._get_api_version('fleet_members')
if api_version == '2022-09-02-preview':
Expand All @@ -173,6 +197,10 @@ def fleet_members(self):
from .v2023_10_15.operations import FleetMembersOperations as OperationClass
elif api_version == '2024-02-02-preview':
from .v2024_02_02_preview.operations import FleetMembersOperations as OperationClass
elif api_version == '2024-04-01':
from .v2024_04_01.operations import FleetMembersOperations as OperationClass
elif api_version == '2024-05-02-preview':
from .v2024_05_02_preview.operations import FleetMembersOperations as OperationClass
else:
raise ValueError("API version {} does not have operation group 'fleet_members'".format(api_version))
self._config.api_version = api_version
Expand All @@ -185,6 +213,8 @@ def fleet_update_strategies(self):
* 2023-08-15-preview: :class:`FleetUpdateStrategiesOperations<azure.mgmt.containerservicefleet.v2023_08_15_preview.operations.FleetUpdateStrategiesOperations>`
* 2023-10-15: :class:`FleetUpdateStrategiesOperations<azure.mgmt.containerservicefleet.v2023_10_15.operations.FleetUpdateStrategiesOperations>`
* 2024-02-02-preview: :class:`FleetUpdateStrategiesOperations<azure.mgmt.containerservicefleet.v2024_02_02_preview.operations.FleetUpdateStrategiesOperations>`
* 2024-04-01: :class:`FleetUpdateStrategiesOperations<azure.mgmt.containerservicefleet.v2024_04_01.operations.FleetUpdateStrategiesOperations>`
* 2024-05-02-preview: :class:`FleetUpdateStrategiesOperations<azure.mgmt.containerservicefleet.v2024_05_02_preview.operations.FleetUpdateStrategiesOperations>`
"""
api_version = self._get_api_version('fleet_update_strategies')
if api_version == '2023-08-15-preview':
Expand All @@ -193,6 +223,10 @@ def fleet_update_strategies(self):
from .v2023_10_15.operations import FleetUpdateStrategiesOperations as OperationClass
elif api_version == '2024-02-02-preview':
from .v2024_02_02_preview.operations import FleetUpdateStrategiesOperations as OperationClass
elif api_version == '2024-04-01':
from .v2024_04_01.operations import FleetUpdateStrategiesOperations as OperationClass
elif api_version == '2024-05-02-preview':
from .v2024_05_02_preview.operations import FleetUpdateStrategiesOperations as OperationClass
else:
raise ValueError("API version {} does not have operation group 'fleet_update_strategies'".format(api_version))
self._config.api_version = api_version
Expand All @@ -210,6 +244,8 @@ def fleets(self):
* 2023-08-15-preview: :class:`FleetsOperations<azure.mgmt.containerservicefleet.v2023_08_15_preview.operations.FleetsOperations>`
* 2023-10-15: :class:`FleetsOperations<azure.mgmt.containerservicefleet.v2023_10_15.operations.FleetsOperations>`
* 2024-02-02-preview: :class:`FleetsOperations<azure.mgmt.containerservicefleet.v2024_02_02_preview.operations.FleetsOperations>`
* 2024-04-01: :class:`FleetsOperations<azure.mgmt.containerservicefleet.v2024_04_01.operations.FleetsOperations>`
* 2024-05-02-preview: :class:`FleetsOperations<azure.mgmt.containerservicefleet.v2024_05_02_preview.operations.FleetsOperations>`
"""
api_version = self._get_api_version('fleets')
if api_version == '2022-09-02-preview':
Expand All @@ -228,6 +264,10 @@ def fleets(self):
from .v2023_10_15.operations import FleetsOperations as OperationClass
elif api_version == '2024-02-02-preview':
from .v2024_02_02_preview.operations import FleetsOperations as OperationClass
elif api_version == '2024-04-01':
from .v2024_04_01.operations import FleetsOperations as OperationClass
elif api_version == '2024-05-02-preview':
from .v2024_05_02_preview.operations import FleetsOperations as OperationClass
else:
raise ValueError("API version {} does not have operation group 'fleets'".format(api_version))
self._config.api_version = api_version
Expand All @@ -243,6 +283,8 @@ def operations(self):
* 2023-08-15-preview: :class:`Operations<azure.mgmt.containerservicefleet.v2023_08_15_preview.operations.Operations>`
* 2023-10-15: :class:`Operations<azure.mgmt.containerservicefleet.v2023_10_15.operations.Operations>`
* 2024-02-02-preview: :class:`Operations<azure.mgmt.containerservicefleet.v2024_02_02_preview.operations.Operations>`
* 2024-04-01: :class:`Operations<azure.mgmt.containerservicefleet.v2024_04_01.operations.Operations>`
* 2024-05-02-preview: :class:`Operations<azure.mgmt.containerservicefleet.v2024_05_02_preview.operations.Operations>`
"""
api_version = self._get_api_version('operations')
if api_version == '2022-09-02-preview':
Expand All @@ -257,6 +299,10 @@ def operations(self):
from .v2023_10_15.operations import Operations as OperationClass
elif api_version == '2024-02-02-preview':
from .v2024_02_02_preview.operations import Operations as OperationClass
elif api_version == '2024-04-01':
from .v2024_04_01.operations import Operations as OperationClass
elif api_version == '2024-05-02-preview':
from .v2024_05_02_preview.operations import Operations as OperationClass
else:
raise ValueError("API version {} does not have operation group 'operations'".format(api_version))
self._config.api_version = api_version
Expand All @@ -271,6 +317,8 @@ def update_runs(self):
* 2023-08-15-preview: :class:`UpdateRunsOperations<azure.mgmt.containerservicefleet.v2023_08_15_preview.operations.UpdateRunsOperations>`
* 2023-10-15: :class:`UpdateRunsOperations<azure.mgmt.containerservicefleet.v2023_10_15.operations.UpdateRunsOperations>`
* 2024-02-02-preview: :class:`UpdateRunsOperations<azure.mgmt.containerservicefleet.v2024_02_02_preview.operations.UpdateRunsOperations>`
* 2024-04-01: :class:`UpdateRunsOperations<azure.mgmt.containerservicefleet.v2024_04_01.operations.UpdateRunsOperations>`
* 2024-05-02-preview: :class:`UpdateRunsOperations<azure.mgmt.containerservicefleet.v2024_05_02_preview.operations.UpdateRunsOperations>`
"""
api_version = self._get_api_version('update_runs')
if api_version == '2023-03-15-preview':
Expand All @@ -283,6 +331,10 @@ def update_runs(self):
from .v2023_10_15.operations import UpdateRunsOperations as OperationClass
elif api_version == '2024-02-02-preview':
from .v2024_02_02_preview.operations import UpdateRunsOperations as OperationClass
elif api_version == '2024-04-01':
from .v2024_04_01.operations import UpdateRunsOperations as OperationClass
elif api_version == '2024-05-02-preview':
from .v2024_05_02_preview.operations import UpdateRunsOperations as OperationClass
else:
raise ValueError("API version {} does not have operation group 'update_runs'".format(api_version))
self._config.api_version = api_version
Expand Down
2 changes: 1 addition & 1 deletion src/fleet/azext_fleet/vendored_sdks/_serialization.py
Original file line number Diff line number Diff line change
Expand Up @@ -1447,7 +1447,7 @@ def _deserialize(self, target_obj, data):
elif isinstance(response, type) and issubclass(response, Enum):
return self.deserialize_enum(data, response)

if data is None:
if data is None or data is CoreNull:
return data
try:
attributes = response._attribute_map # type: ignore
Expand Down
2 changes: 1 addition & 1 deletion src/fleet/azext_fleet/vendored_sdks/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
# license information.
# --------------------------------------------------------------------------

VERSION = "1.0.0"
VERSION = "2.0.0"
10 changes: 0 additions & 10 deletions src/fleet/azext_fleet/vendored_sdks/aio/__init__.py

This file was deleted.

66 changes: 0 additions & 66 deletions src/fleet/azext_fleet/vendored_sdks/aio/_configuration.py

This file was deleted.

Loading
Loading