Skip to content

Commit bd006c2

Browse files
[AutoRelease] t2-containerservicefleet-2023-09-06-65762(can only be merged by SDK owner) (Azure#31953)
* code and test * Update CHANGELOG.md --------- Co-authored-by: azure-sdk <PythonSdkPipelines> Co-authored-by: ChenxiJiang333 <119990644+ChenxiJiang333@users.noreply.github.com>
1 parent ebcccaf commit bd006c2

File tree

95 files changed

+10199
-375
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+10199
-375
lines changed
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,22 @@
11
# Release History
22

3+
## 1.0.0b2 (2023-09-12)
4+
5+
### Features Added
6+
7+
- Model Fleet has a new parameter identity
8+
- Model FleetHubProfile has a new parameter agent_profile
9+
- Model FleetHubProfile has a new parameter api_server_access_profile
10+
- Model FleetPatch has a new parameter identity
11+
- Model ManagedClusterUpdate has a new parameter node_image_selection
12+
- Model MemberUpdateStatus has a new parameter message
13+
- Model UpdateRunStatus has a new parameter node_image_selection
14+
15+
### Breaking Changes
16+
17+
- Renamed operation FleetMembersOperations.update to FleetMembersOperations.begin_update
18+
- Renamed operation FleetsOperations.update to FleetsOperations.begin_update
19+
320
## 1.0.0b1 (2023-06-16)
421

522
* Initial Release
Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,16 @@
11
{
2-
"commit": "1fea23ac36b111293dc3efc30f725e9ebb790f7f",
2+
"commit": "c320f58d8643a309c126dd4ec5fdc6737fccd981",
33
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
4-
"autorest": "3.9.2",
4+
"autorest": "3.9.7",
55
"use": [
6-
"@autorest/python@6.4.12",
7-
"@autorest/modelerfour@4.24.3"
6+
"@autorest/python@6.7.1",
7+
"@autorest/modelerfour@4.26.2"
88
],
9-
"autorest_command": "autorest specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.4.12 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
10-
"readme": "specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.md"
9+
"autorest_command": "autorest specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.md --generate-sample=True --include-x-ms-examples-original-file=True --python --python-sdks-folder=/home/vsts/work/1/azure-sdk-for-python/sdk --use=@autorest/python@6.7.1 --use=@autorest/modelerfour@4.26.2 --version=3.9.7 --version-tolerant=False",
10+
"readme": "specification/containerservice/resource-manager/Microsoft.ContainerService/fleet/readme.md",
11+
"package-2023-06-preview": "2023-08-24 23:54:30 -0700 802fc0a5edd13b96e8a6aeadb742657188e9e866 preview/2023-06-15-preview/fleets.json",
12+
"package-2023-03-preview": "2023-08-24 23:54:30 -0700 802fc0a5edd13b96e8a6aeadb742657188e9e866 preview/2023-03-15-preview/fleets.json",
13+
"package-2022-09-preview": "2023-08-24 23:54:30 -0700 802fc0a5edd13b96e8a6aeadb742657188e9e866 preview/2022-09-02-preview/fleets.json",
14+
"package-2022-07-preview": "2023-02-15 15:17:59 +0800 67527326606bd3c71700e2b96ff3c9ce9e655e29 preview/2022-07-02-preview/fleets.json",
15+
"package-2022-06-preview": "2023-02-15 15:17:59 +0800 67527326606bd3c71700e2b96ff3c9ce9e655e29 preview/2022-06-02-preview/fleets.json"
1116
}

sdk/containerservice/azure-mgmt-containerservicefleet/azure/mgmt/containerservicefleet/_container_service_fleet_mgmt_client.py

Lines changed: 23 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class ContainerServiceFleetMgmtClient(MultiApiClientMixin, _SDKClient):
5353
:keyword int polling_interval: Default waiting time between two polls for LRO operations if no Retry-After header is present.
5454
"""
5555

56-
DEFAULT_API_VERSION = '2023-03-15-preview'
56+
DEFAULT_API_VERSION = '2023-06-15-preview'
5757
_PROFILE_TAG = "azure.mgmt.containerservicefleet.ContainerServiceFleetMgmtClient"
5858
LATEST_PROFILE = ProfileDefinition({
5959
_PROFILE_TAG: {
@@ -71,6 +71,8 @@ def __init__(
7171
profile: KnownProfiles=KnownProfiles.default,
7272
**kwargs: Any
7373
):
74+
if api_version:
75+
kwargs.setdefault('api_version', api_version)
7476
self._config = ContainerServiceFleetMgmtClientConfiguration(credential, subscription_id, **kwargs)
7577
self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
7678
super(ContainerServiceFleetMgmtClient, self).__init__(
@@ -90,6 +92,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
9092
* 2022-07-02-preview: :mod:`v2022_07_02_preview.models<azure.mgmt.containerservicefleet.v2022_07_02_preview.models>`
9193
* 2022-06-02-preview: :mod:`v2022_09_02_preview.models<azure.mgmt.containerservicefleet.v2022_09_02_preview.models>`
9294
* 2023-03-15-preview: :mod:`v2023_03_15_preview.models<azure.mgmt.containerservicefleet.v2023_03_15_preview.models>`
95+
* 2023-06-15-preview: :mod:`v2023_06_15_preview.models<azure.mgmt.containerservicefleet.v2023_06_15_preview.models>`
9396
"""
9497
if api_version == '2022-09-02-preview':
9598
from .v2022_06_02_preview import models
@@ -103,6 +106,9 @@ def models(cls, api_version=DEFAULT_API_VERSION):
103106
elif api_version == '2023-03-15-preview':
104107
from .v2023_03_15_preview import models
105108
return models
109+
elif api_version == '2023-06-15-preview':
110+
from .v2023_06_15_preview import models
111+
return models
106112
raise ValueError("API version {} is not available".format(api_version))
107113

108114
@property
@@ -113,6 +119,7 @@ def fleet_members(self):
113119
* 2022-07-02-preview: :class:`FleetMembersOperations<azure.mgmt.containerservicefleet.v2022_07_02_preview.operations.FleetMembersOperations>`
114120
* 2022-06-02-preview: :class:`FleetMembersOperations<azure.mgmt.containerservicefleet.v2022_09_02_preview.operations.FleetMembersOperations>`
115121
* 2023-03-15-preview: :class:`FleetMembersOperations<azure.mgmt.containerservicefleet.v2023_03_15_preview.operations.FleetMembersOperations>`
122+
* 2023-06-15-preview: :class:`FleetMembersOperations<azure.mgmt.containerservicefleet.v2023_06_15_preview.operations.FleetMembersOperations>`
116123
"""
117124
api_version = self._get_api_version('fleet_members')
118125
if api_version == '2022-09-02-preview':
@@ -123,10 +130,12 @@ def fleet_members(self):
123130
from .v2022_09_02_preview.operations import FleetMembersOperations as OperationClass
124131
elif api_version == '2023-03-15-preview':
125132
from .v2023_03_15_preview.operations import FleetMembersOperations as OperationClass
133+
elif api_version == '2023-06-15-preview':
134+
from .v2023_06_15_preview.operations import FleetMembersOperations as OperationClass
126135
else:
127136
raise ValueError("API version {} does not have operation group 'fleet_members'".format(api_version))
128137
self._config.api_version = api_version
129-
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
138+
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version)
130139

131140
@property
132141
def fleets(self):
@@ -136,6 +145,7 @@ def fleets(self):
136145
* 2022-07-02-preview: :class:`FleetsOperations<azure.mgmt.containerservicefleet.v2022_07_02_preview.operations.FleetsOperations>`
137146
* 2022-06-02-preview: :class:`FleetsOperations<azure.mgmt.containerservicefleet.v2022_09_02_preview.operations.FleetsOperations>`
138147
* 2023-03-15-preview: :class:`FleetsOperations<azure.mgmt.containerservicefleet.v2023_03_15_preview.operations.FleetsOperations>`
148+
* 2023-06-15-preview: :class:`FleetsOperations<azure.mgmt.containerservicefleet.v2023_06_15_preview.operations.FleetsOperations>`
139149
"""
140150
api_version = self._get_api_version('fleets')
141151
if api_version == '2022-09-02-preview':
@@ -146,41 +156,49 @@ def fleets(self):
146156
from .v2022_09_02_preview.operations import FleetsOperations as OperationClass
147157
elif api_version == '2023-03-15-preview':
148158
from .v2023_03_15_preview.operations import FleetsOperations as OperationClass
159+
elif api_version == '2023-06-15-preview':
160+
from .v2023_06_15_preview.operations import FleetsOperations as OperationClass
149161
else:
150162
raise ValueError("API version {} does not have operation group 'fleets'".format(api_version))
151163
self._config.api_version = api_version
152-
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
164+
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version)
153165

154166
@property
155167
def operations(self):
156168
"""Instance depends on the API version:
157169
158170
* 2022-09-02-preview: :class:`Operations<azure.mgmt.containerservicefleet.v2022_06_02_preview.operations.Operations>`
159171
* 2023-03-15-preview: :class:`Operations<azure.mgmt.containerservicefleet.v2023_03_15_preview.operations.Operations>`
172+
* 2023-06-15-preview: :class:`Operations<azure.mgmt.containerservicefleet.v2023_06_15_preview.operations.Operations>`
160173
"""
161174
api_version = self._get_api_version('operations')
162175
if api_version == '2022-09-02-preview':
163176
from .v2022_06_02_preview.operations import Operations as OperationClass
164177
elif api_version == '2023-03-15-preview':
165178
from .v2023_03_15_preview.operations import Operations as OperationClass
179+
elif api_version == '2023-06-15-preview':
180+
from .v2023_06_15_preview.operations import Operations as OperationClass
166181
else:
167182
raise ValueError("API version {} does not have operation group 'operations'".format(api_version))
168183
self._config.api_version = api_version
169-
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
184+
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version)
170185

171186
@property
172187
def update_runs(self):
173188
"""Instance depends on the API version:
174189
175190
* 2023-03-15-preview: :class:`UpdateRunsOperations<azure.mgmt.containerservicefleet.v2023_03_15_preview.operations.UpdateRunsOperations>`
191+
* 2023-06-15-preview: :class:`UpdateRunsOperations<azure.mgmt.containerservicefleet.v2023_06_15_preview.operations.UpdateRunsOperations>`
176192
"""
177193
api_version = self._get_api_version('update_runs')
178194
if api_version == '2023-03-15-preview':
179195
from .v2023_03_15_preview.operations import UpdateRunsOperations as OperationClass
196+
elif api_version == '2023-06-15-preview':
197+
from .v2023_06_15_preview.operations import UpdateRunsOperations as OperationClass
180198
else:
181199
raise ValueError("API version {} does not have operation group 'update_runs'".format(api_version))
182200
self._config.api_version = api_version
183-
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
201+
return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version)
184202

185203
def close(self):
186204
self._client.close()

sdk/containerservice/azure-mgmt-containerservicefleet/azure/mgmt/containerservicefleet/_serialization.py

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -664,8 +664,9 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
664664
_serialized.update(_new_attr) # type: ignore
665665
_new_attr = _new_attr[k] # type: ignore
666666
_serialized = _serialized[k]
667-
except ValueError:
668-
continue
667+
except ValueError as err:
668+
if isinstance(err, SerializationError):
669+
raise
669670

670671
except (AttributeError, KeyError, TypeError) as err:
671672
msg = "Attribute {} in object {} cannot be serialized.\n{}".format(attr_name, class_name, str(target_obj))
@@ -743,6 +744,8 @@ def query(self, name, data, data_type, **kwargs):
743744
744745
:param data: The data to be serialized.
745746
:param str data_type: The type to be serialized from.
747+
:keyword bool skip_quote: Whether to skip quote the serialized result.
748+
Defaults to False.
746749
:rtype: str
747750
:raises: TypeError if serialization fails.
748751
:raises: ValueError if data is None
@@ -751,10 +754,8 @@ def query(self, name, data, data_type, **kwargs):
751754
# Treat the list aside, since we don't want to encode the div separator
752755
if data_type.startswith("["):
753756
internal_data_type = data_type[1:-1]
754-
data = [self.serialize_data(d, internal_data_type, **kwargs) if d is not None else "" for d in data]
755-
if not kwargs.get("skip_quote", False):
756-
data = [quote(str(d), safe="") for d in data]
757-
return str(self.serialize_iter(data, internal_data_type, **kwargs))
757+
do_quote = not kwargs.get('skip_quote', False)
758+
return str(self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs))
758759

759760
# Not a list, regular serialization
760761
output = self.serialize_data(data, data_type, **kwargs)
@@ -893,6 +894,8 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
893894
not be None or empty.
894895
:param str div: If set, this str will be used to combine the elements
895896
in the iterable into a combined string. Default is 'None'.
897+
:keyword bool do_quote: Whether to quote the serialized result of each iterable element.
898+
Defaults to False.
896899
:rtype: list, str
897900
"""
898901
if isinstance(data, str):
@@ -905,9 +908,18 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
905908
for d in data:
906909
try:
907910
serialized.append(self.serialize_data(d, iter_type, **kwargs))
908-
except ValueError:
911+
except ValueError as err:
912+
if isinstance(err, SerializationError):
913+
raise
909914
serialized.append(None)
910915

916+
if kwargs.get('do_quote', False):
917+
serialized = [
918+
'' if s is None else quote(str(s), safe='')
919+
for s
920+
in serialized
921+
]
922+
911923
if div:
912924
serialized = ["" if s is None else str(s) for s in serialized]
913925
serialized = div.join(serialized)
@@ -952,7 +964,9 @@ def serialize_dict(self, attr, dict_type, **kwargs):
952964
for key, value in attr.items():
953965
try:
954966
serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs)
955-
except ValueError:
967+
except ValueError as err:
968+
if isinstance(err, SerializationError):
969+
raise
956970
serialized[self.serialize_unicode(key)] = None
957971

958972
if "xml" in serialization_ctxt:

sdk/containerservice/azure-mgmt-containerservicefleet/azure/mgmt/containerservicefleet/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# license information.
66
# --------------------------------------------------------------------------
77

8-
VERSION = "1.0.0b1"
8+
VERSION = "1.0.0b2"

0 commit comments

Comments
 (0)