code and test (Azure#31489)

Co-authored-by: azure-sdk <PythonSdkPipelines>

Author: azure-sdk

sdk/redhatopenshift/azure-mgmt-redhatopenshift/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Release History
 
+## 1.3.0 (2023-08-18)
+
+### Features Added
+
+  - Model NetworkProfile has a new parameter outbound_type
+
 ## 1.3.0b1 (2023-02-16)
 
 ### Other Changes

sdk/redhatopenshift/azure-mgmt-redhatopenshift/README.md

@@ -45,8 +45,9 @@ client = AzureRedHatOpenShiftClient(credential=DefaultAzureCredential(), subscri
 
 ## Examples
 
-
-Code samples for this package can be found at [Red Hat Openshift Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com and [Samples Repo](https://aka.ms/azsdk/python/mgmt/samples)
+Code samples for this package can be found at:
+- [Search Red Hat Openshift Management](https://docs.microsoft.com/samples/browse/?languages=python&term=Getting%20started%20-%20Managing&terms=Getting%20started%20-%20Managing) on docs.microsoft.com
+- [Azure Python Mgmt SDK Samples Repo](https://aka.ms/azsdk/python/mgmt/samples)
 
 
 ## Troubleshooting

sdk/redhatopenshift/azure-mgmt-redhatopenshift/_meta.json

@@ -1,11 +1,16 @@
 {
-  "commit": "51d4c24a011e300b9713179e0515fef35bf3f678",
+  "commit": "a3089b2764df11b10a8a43e2a5a33dbe4d3653ca",
   "repository_url": "https://github.com/Azure/azure-rest-api-specs",
-  "autorest": "3.9.2",
+  "autorest": "3.9.7",
   "use": [
-    "@autorest/python@6.4.0",
-    "@autorest/modelerfour@4.24.3"
+    "@autorest/python@6.7.1",
+    "@autorest/modelerfour@4.26.2"
   ],
-  "autorest_command": "autorest specification/redhatopenshift/resource-manager/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.0 --use=@autorest/modelerfour@4.24.3 --version=3.9.2 --version-tolerant=False",
-  "readme": "specification/redhatopenshift/resource-manager/readme.md"
+  "autorest_command": "autorest specification/redhatopenshift/resource-manager/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",
+  "readme": "specification/redhatopenshift/resource-manager/readme.md",
+  "package-2020-04-30": "2022-03-13 20:06:12 -0700 b0a0fccef5bfe412614343ef20a5be7427661330 Microsoft.RedHatOpenShift/stable/2020-04-30/redhatopenshift.json",
+  "package-2021-09-01-preview": "2021-09-08 03:37:58 +0300 b9e1a57680ad54fd555bce727702550aefcd2d47 Microsoft.RedHatOpenShift/preview/2021-09-01-preview/redhatopenshift.json",
+  "package-2022-04-01": "2022-04-26 20:09:23 -0700 3c622a337592e7debc58b09a9fdc3aa275ba808f Microsoft.RedHatOpenShift/stable/2022-04-01/redhatopenshift.json",
+  "package-2022-09-04": "2022-12-06 18:13:21 -0800 1be09531e4c6edeafde41d6562371566d39669e8 Microsoft.RedHatOpenShift/stable/2022-09-04/redhatopenshift.json",
+  "package-2023-04-01": "2023-07-24 17:12:10 +1000 db80d2c04a9e7ecd7d1fee6da42fe5b825fabf4b Microsoft.RedHatOpenShift/stable/2023-04-01/redhatopenshift.json"
 }

sdk/redhatopenshift/azure-mgmt-redhatopenshift/azure/mgmt/redhatopenshift/_azure_red_hat_open_shift_client.py

@@ -53,7 +53,7 @@ class AzureRedHatOpenShiftClient(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 = '2022-09-04'
+    DEFAULT_API_VERSION = '2023-04-01'
     _PROFILE_TAG = "azure.mgmt.redhatopenshift.AzureRedHatOpenShiftClient"
     LATEST_PROFILE = ProfileDefinition({
         _PROFILE_TAG: {
@@ -71,6 +71,8 @@ def __init__(
         profile: KnownProfiles=KnownProfiles.default,
         **kwargs: Any
     ):
+        if api_version:
+            kwargs.setdefault('api_version', api_version)
         self._config = AzureRedHatOpenShiftClientConfiguration(credential, subscription_id, **kwargs)
         self._client = ARMPipelineClient(base_url=base_url, config=self._config, **kwargs)
         super(AzureRedHatOpenShiftClient, self).__init__(
@@ -90,6 +92,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
            * 2021-09-01-preview: :mod:`v2021_09_01_preview.models<azure.mgmt.redhatopenshift.v2021_09_01_preview.models>`
            * 2022-04-01: :mod:`v2022_04_01.models<azure.mgmt.redhatopenshift.v2022_04_01.models>`
            * 2022-09-04: :mod:`v2022_09_04.models<azure.mgmt.redhatopenshift.v2022_09_04.models>`
+           * 2023-04-01: :mod:`v2023_04_01.models<azure.mgmt.redhatopenshift.v2023_04_01.models>`
         """
         if api_version == '2020-04-30':
             from .v2020_04_30 import models
@@ -103,21 +106,27 @@ def models(cls, api_version=DEFAULT_API_VERSION):
         elif api_version == '2022-09-04':
             from .v2022_09_04 import models
             return models
+        elif api_version == '2023-04-01':
+            from .v2023_04_01 import models
+            return models
         raise ValueError("API version {} is not available".format(api_version))
 
     @property
     def machine_pools(self):
         """Instance depends on the API version:
 
            * 2022-09-04: :class:`MachinePoolsOperations<azure.mgmt.redhatopenshift.v2022_09_04.operations.MachinePoolsOperations>`
+           * 2023-04-01: :class:`MachinePoolsOperations<azure.mgmt.redhatopenshift.v2023_04_01.operations.MachinePoolsOperations>`
         """
         api_version = self._get_api_version('machine_pools')
         if api_version == '2022-09-04':
             from .v2022_09_04.operations import MachinePoolsOperations as OperationClass
+        elif api_version == '2023-04-01':
+            from .v2023_04_01.operations import MachinePoolsOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'machine_pools'".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)))
+        return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version)
 
     @property
     def open_shift_clusters(self):
@@ -127,6 +136,7 @@ def open_shift_clusters(self):
            * 2021-09-01-preview: :class:`OpenShiftClustersOperations<azure.mgmt.redhatopenshift.v2021_09_01_preview.operations.OpenShiftClustersOperations>`
            * 2022-04-01: :class:`OpenShiftClustersOperations<azure.mgmt.redhatopenshift.v2022_04_01.operations.OpenShiftClustersOperations>`
            * 2022-09-04: :class:`OpenShiftClustersOperations<azure.mgmt.redhatopenshift.v2022_09_04.operations.OpenShiftClustersOperations>`
+           * 2023-04-01: :class:`OpenShiftClustersOperations<azure.mgmt.redhatopenshift.v2023_04_01.operations.OpenShiftClustersOperations>`
         """
         api_version = self._get_api_version('open_shift_clusters')
         if api_version == '2020-04-30':
@@ -137,24 +147,29 @@ def open_shift_clusters(self):
             from .v2022_04_01.operations import OpenShiftClustersOperations as OperationClass
         elif api_version == '2022-09-04':
             from .v2022_09_04.operations import OpenShiftClustersOperations as OperationClass
+        elif api_version == '2023-04-01':
+            from .v2023_04_01.operations import OpenShiftClustersOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'open_shift_clusters'".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)))
+        return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version)
 
     @property
     def open_shift_versions(self):
         """Instance depends on the API version:
 
            * 2022-09-04: :class:`OpenShiftVersionsOperations<azure.mgmt.redhatopenshift.v2022_09_04.operations.OpenShiftVersionsOperations>`
+           * 2023-04-01: :class:`OpenShiftVersionsOperations<azure.mgmt.redhatopenshift.v2023_04_01.operations.OpenShiftVersionsOperations>`
         """
         api_version = self._get_api_version('open_shift_versions')
         if api_version == '2022-09-04':
             from .v2022_09_04.operations import OpenShiftVersionsOperations as OperationClass
+        elif api_version == '2023-04-01':
+            from .v2023_04_01.operations import OpenShiftVersionsOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'open_shift_versions'".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)))
+        return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version)
 
     @property
     def operations(self):
@@ -164,6 +179,7 @@ def operations(self):
            * 2021-09-01-preview: :class:`Operations<azure.mgmt.redhatopenshift.v2021_09_01_preview.operations.Operations>`
            * 2022-04-01: :class:`Operations<azure.mgmt.redhatopenshift.v2022_04_01.operations.Operations>`
            * 2022-09-04: :class:`Operations<azure.mgmt.redhatopenshift.v2022_09_04.operations.Operations>`
+           * 2023-04-01: :class:`Operations<azure.mgmt.redhatopenshift.v2023_04_01.operations.Operations>`
         """
         api_version = self._get_api_version('operations')
         if api_version == '2020-04-30':
@@ -174,52 +190,63 @@ def operations(self):
             from .v2022_04_01.operations import Operations as OperationClass
         elif api_version == '2022-09-04':
             from .v2022_09_04.operations import Operations as OperationClass
+        elif api_version == '2023-04-01':
+            from .v2023_04_01.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
-        return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
+        return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version)
 
     @property
     def secrets(self):
         """Instance depends on the API version:
 
            * 2022-09-04: :class:`SecretsOperations<azure.mgmt.redhatopenshift.v2022_09_04.operations.SecretsOperations>`
+           * 2023-04-01: :class:`SecretsOperations<azure.mgmt.redhatopenshift.v2023_04_01.operations.SecretsOperations>`
         """
         api_version = self._get_api_version('secrets')
         if api_version == '2022-09-04':
             from .v2022_09_04.operations import SecretsOperations as OperationClass
+        elif api_version == '2023-04-01':
+            from .v2023_04_01.operations import SecretsOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'secrets'".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)))
+        return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version)
 
     @property
     def sync_identity_providers(self):
         """Instance depends on the API version:
 
            * 2022-09-04: :class:`SyncIdentityProvidersOperations<azure.mgmt.redhatopenshift.v2022_09_04.operations.SyncIdentityProvidersOperations>`
+           * 2023-04-01: :class:`SyncIdentityProvidersOperations<azure.mgmt.redhatopenshift.v2023_04_01.operations.SyncIdentityProvidersOperations>`
         """
         api_version = self._get_api_version('sync_identity_providers')
         if api_version == '2022-09-04':
             from .v2022_09_04.operations import SyncIdentityProvidersOperations as OperationClass
+        elif api_version == '2023-04-01':
+            from .v2023_04_01.operations import SyncIdentityProvidersOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'sync_identity_providers'".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)))
+        return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version)
 
     @property
     def sync_sets(self):
         """Instance depends on the API version:
 
            * 2022-09-04: :class:`SyncSetsOperations<azure.mgmt.redhatopenshift.v2022_09_04.operations.SyncSetsOperations>`
+           * 2023-04-01: :class:`SyncSetsOperations<azure.mgmt.redhatopenshift.v2023_04_01.operations.SyncSetsOperations>`
         """
         api_version = self._get_api_version('sync_sets')
         if api_version == '2022-09-04':
             from .v2022_09_04.operations import SyncSetsOperations as OperationClass
+        elif api_version == '2023-04-01':
+            from .v2023_04_01.operations import SyncSetsOperations as OperationClass
         else:
             raise ValueError("API version {} does not have operation group 'sync_sets'".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)))
+        return OperationClass(self._client, self._config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)), api_version)
 
     def close(self):
         self._client.close()

sdk/redhatopenshift/azure-mgmt-redhatopenshift/azure/mgmt/redhatopenshift/_serialization.py

@@ -631,7 +631,7 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
                         if xml_desc.get("attr", False):
                             if xml_ns:
                                 ET.register_namespace(xml_prefix, xml_ns)
-                                xml_name = "{}{}".format(xml_ns, xml_name)
+                                xml_name = "{{{}}}{}".format(xml_ns, xml_name)
                             serialized.set(xml_name, new_attr)  # type: ignore
                             continue
                         if xml_desc.get("text", False):
@@ -664,8 +664,9 @@ def _serialize(self, target_obj, data_type=None, **kwargs):
                                 _serialized.update(_new_attr)  # type: ignore
                             _new_attr = _new_attr[k]  # type: ignore
                             _serialized = _serialized[k]
-                except ValueError:
-                    continue
+                except ValueError as err:
+                    if isinstance(err, SerializationError):
+                        raise
 
         except (AttributeError, KeyError, TypeError) as err:
             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):
 
         :param data: The data to be serialized.
         :param str data_type: The type to be serialized from.
+        :keyword bool skip_quote: Whether to skip quote the serialized result.
+        Defaults to False.
         :rtype: str
         :raises: TypeError if serialization fails.
         :raises: ValueError if data is None
@@ -751,10 +754,8 @@ def query(self, name, data, data_type, **kwargs):
             # Treat the list aside, since we don't want to encode the div separator
             if data_type.startswith("["):
                 internal_data_type = data_type[1:-1]
-                data = [self.serialize_data(d, internal_data_type, **kwargs) if d is not None else "" for d in data]
-                if not kwargs.get("skip_quote", False):
-                    data = [quote(str(d), safe="") for d in data]
-                return str(self.serialize_iter(data, internal_data_type, **kwargs))
+                do_quote = not kwargs.get('skip_quote', False)
+                return str(self.serialize_iter(data, internal_data_type, do_quote=do_quote, **kwargs))
 
             # Not a list, regular serialization
             output = self.serialize_data(data, data_type, **kwargs)
@@ -893,6 +894,8 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
          not be None or empty.
         :param str div: If set, this str will be used to combine the elements
          in the iterable into a combined string. Default is 'None'.
+        :keyword bool do_quote: Whether to quote the serialized result of each iterable element.
+        Defaults to False.
         :rtype: list, str
         """
         if isinstance(data, str):
@@ -905,9 +908,18 @@ def serialize_iter(self, data, iter_type, div=None, **kwargs):
         for d in data:
             try:
                 serialized.append(self.serialize_data(d, iter_type, **kwargs))
-            except ValueError:
+            except ValueError as err:
+                if isinstance(err, SerializationError):
+                    raise
                 serialized.append(None)
 
+        if kwargs.get('do_quote', False):
+            serialized = [
+                '' if s is None else quote(str(s), safe='')
+                for s
+                in serialized
+            ]
+
         if div:
             serialized = ["" if s is None else str(s) for s in serialized]
             serialized = div.join(serialized)
@@ -952,7 +964,9 @@ def serialize_dict(self, attr, dict_type, **kwargs):
         for key, value in attr.items():
             try:
                 serialized[self.serialize_unicode(key)] = self.serialize_data(value, dict_type, **kwargs)
-            except ValueError:
+            except ValueError as err:
+                if isinstance(err, SerializationError):
+                    raise
                 serialized[self.serialize_unicode(key)] = None
 
         if "xml" in serialization_ctxt:
@@ -1273,7 +1287,7 @@ def _extract_name_from_internal_type(internal_type):
     xml_name = internal_type_xml_map.get("name", internal_type.__name__)
     xml_ns = internal_type_xml_map.get("ns", None)
     if xml_ns:
-        xml_name = "{}{}".format(xml_ns, xml_name)
+        xml_name = "{{{}}}{}".format(xml_ns, xml_name)
     return xml_name
 
 
@@ -1297,7 +1311,7 @@ def xml_key_extractor(attr, attr_desc, data):
     # Integrate namespace if necessary
     xml_ns = xml_desc.get("ns", internal_type_xml_map.get("ns", None))
     if xml_ns:
-        xml_name = "{}{}".format(xml_ns, xml_name)
+        xml_name = "{{{}}}{}".format(xml_ns, xml_name)
 
     # If it's an attribute, that's simple
     if xml_desc.get("attr", False):

sdk/redhatopenshift/azure-mgmt-redhatopenshift/azure/mgmt/redhatopenshift/_version.py

@@ -6,5 +6,5 @@
 # Changes may cause incorrect behavior and will be lost if the code is regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "1.3.0b1"
+VERSION = "1.3.0"