add client side validation info to mixin operations (#775)

Azure · Sep 14, 2020 · 70fad5b · 70fad5b
1 parent 494403c
commit 70fad5b
Show file tree

Hide file tree

Showing 32 changed files with 87 additions and 18 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,14 @@
 # Change Log
 
+### 2020-09-14 - 5.3.2
+Autorest core version: 3.0.6318
+
+Modelerfour version: 4.15.419
+
+**Bug fixes**
+
+- Allow client side validation to be turned off for multiapi mixin operations  #775
+
 ### 2020-09-14 - 5.3.1
 Autorest core version: 3.0.6318
 

diff --git a/autorest/codegen/templates/metadata.json.jinja2 b/autorest/codegen/templates/metadata.json.jinja2
@@ -11,7 +11,8 @@
         "base_url": {{ (keywords.escape_str(base_url) if base_url else None) | tojson }},
         "custom_base_url": {{ (keywords.escape_str(code_model.custom_base_url) if code_model.custom_base_url else None) | tojson }},
         "azure_arm": {{ code_model.options["azure_arm"]  | tojson }},
-        "has_lro_operations": {{ code_model.has_lro_operations | tojson }}
+        "has_lro_operations": {{ code_model.has_lro_operations | tojson }},
+        "client_side_validation": {{ code_model.options["client_side_validation"] | tojson }}
     },
     "global_parameters": {
         "sync_method": {

diff --git a/autorest/multiapi/__init__.py b/autorest/multiapi/__init__.py
@@ -429,6 +429,7 @@ def process(self) -> bool:
             "base_url": metadata_json["client"]["base_url"],
             "custom_base_url_to_api_version": self._build_custom_base_url_to_api_version(paths_to_versions),
             "azure_arm": metadata_json["client"]["azure_arm"],
+            "client_side_validation": metadata_json["client"]["client_side_validation"],
             "has_lro_operations": self._has_lro_operations(paths_to_versions)
         }
 

diff --git a/autorest/multiapi/templates/multiapi_operations_mixin.py.jinja2 b/autorest/multiapi/templates/multiapi_operations_mixin.py.jinja2
@@ -32,6 +32,9 @@ class {{ client_name }}OperationsMixin(object):
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        {% if not client_side_validation %}
+        mixin_instance._serialize.client_side_validation = False
+        {% endif %}
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return {{ "await " if async_mode and metadata['coroutine'] else "" }}mixin_instance.{{ operation_name }}({{ metadata['call'] }}{{ ", **kwargs" if metadata['call'] else "**kwargs" }})
 {% endfor %}
diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_operations_mixin.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/_operations_mixin.py
@@ -55,6 +55,7 @@ def begin_test_lro(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.begin_test_lro(product, **kwargs)
 
@@ -89,6 +90,7 @@ def begin_test_lro_and_paging(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.begin_test_lro_and_paging(client_request_id, test_lro_and_paging_options, **kwargs)
 
@@ -120,6 +122,7 @@ def test_one(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.test_one(id, message, **kwargs)
 
@@ -143,5 +146,6 @@ def test_paging(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.test_paging(**kwargs)
diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_operations_mixin.py b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/aio/_operations_mixin.py
@@ -51,6 +51,7 @@ async def begin_test_lro(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return await mixin_instance.begin_test_lro(product, **kwargs)
 
@@ -85,6 +86,7 @@ def begin_test_lro_and_paging(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.begin_test_lro_and_paging(client_request_id, test_lro_and_paging_options, **kwargs)
 
@@ -116,6 +118,7 @@ async def test_one(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return await mixin_instance.test_one(id, message, **kwargs)
 
@@ -139,5 +142,6 @@ def test_paging(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.test_paging(**kwargs)
diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_metadata.json b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v1/_metadata.json
@@ -8,7 +8,8 @@
         "base_url": "\u0027http://localhost:3000\u0027",
         "custom_base_url": null,
         "azure_arm": true,
-        "has_lro_operations": true
+        "has_lro_operations": true,
+        "client_side_validation": false
     },
     "global_parameters": {
         "sync_method": {

diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_metadata.json b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v2/_metadata.json
@@ -8,7 +8,8 @@
         "base_url": "\u0027http://localhost:3000\u0027",
         "custom_base_url": null,
         "azure_arm": true,
-        "has_lro_operations": false
+        "has_lro_operations": false,
+        "client_side_validation": false
     },
     "global_parameters": {
         "sync_method": {

diff --git a/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_metadata.json b/test/multiapi/Expected/AcceptanceTests/Multiapi/multiapi/v3/_metadata.json
@@ -8,7 +8,8 @@
         "base_url": "\u0027http://localhost:3000\u0027",
         "custom_base_url": null,
         "azure_arm": true,
-        "has_lro_operations": false
+        "has_lro_operations": false,
+        "client_side_validation": false
     },
     "global_parameters": {
         "sync_method": {

diff --git a/...ests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_operations_mixin.py b/...ests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/_operations_mixin.py
@@ -55,6 +55,7 @@ def begin_test_lro(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.begin_test_lro(product, **kwargs)
 
@@ -89,6 +90,7 @@ def begin_test_lro_and_paging(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.begin_test_lro_and_paging(client_request_id, test_lro_and_paging_options, **kwargs)
 
@@ -120,6 +122,7 @@ def test_one(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.test_one(id, message, **kwargs)
 
@@ -143,5 +146,6 @@ def test_paging(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.test_paging(**kwargs)
diff --git a/.../MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_operations_mixin.py b/.../MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/aio/_operations_mixin.py
@@ -51,6 +51,7 @@ async def begin_test_lro(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return await mixin_instance.begin_test_lro(product, **kwargs)
 
@@ -85,6 +86,7 @@ def begin_test_lro_and_paging(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.begin_test_lro_and_paging(client_request_id, test_lro_and_paging_options, **kwargs)
 
@@ -116,6 +118,7 @@ async def test_one(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return await mixin_instance.test_one(id, message, **kwargs)
 
@@ -139,5 +142,6 @@ def test_paging(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.test_paging(**kwargs)
diff --git a/...ceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_metadata.json b/...ceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v1/_metadata.json
@@ -8,7 +8,8 @@
         "base_url": "\u0027http://localhost:3000\u0027",
         "custom_base_url": null,
         "azure_arm": true,
-        "has_lro_operations": true
+        "has_lro_operations": true,
+        "client_side_validation": false
     },
     "global_parameters": {
         "sync_method": {

diff --git a/...ceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_metadata.json b/...ceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v2/_metadata.json
@@ -8,7 +8,8 @@
         "base_url": "\u0027http://localhost:3000\u0027",
         "custom_base_url": null,
         "azure_arm": true,
-        "has_lro_operations": false
+        "has_lro_operations": false,
+        "client_side_validation": false
     },
     "global_parameters": {
         "sync_method": {

diff --git a/...ceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_metadata.json b/...ceTests/MultiapiCredentialDefaultPolicy/multiapicredentialdefaultpolicy/v3/_metadata.json
@@ -8,7 +8,8 @@
         "base_url": "\u0027http://localhost:3000\u0027",
         "custom_base_url": null,
         "azure_arm": true,
-        "has_lro_operations": false
+        "has_lro_operations": false,
+        "client_side_validation": false
     },
     "global_parameters": {
         "sync_method": {

diff --git a/...Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_operations_mixin.py b/...Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/_operations_mixin.py
@@ -49,5 +49,6 @@ def test(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.test(id, **kwargs)
diff --git a/...cted/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_operations_mixin.py b/...cted/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/aio/_operations_mixin.py
@@ -45,5 +45,6 @@ async def test(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return await mixin_instance.test(id, **kwargs)
diff --git a/...pi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/_metadata.json b/...pi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v1/_metadata.json
@@ -8,7 +8,8 @@
         "base_url": null,
         "custom_base_url": "\u0027{Endpoint}/multiapiCustomBaseUrl/v1\u0027",
         "azure_arm": false,
-        "has_lro_operations": false
+        "has_lro_operations": false,
+        "client_side_validation": false
     },
     "global_parameters": {
         "sync_method": {

diff --git a/...pi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/_metadata.json b/...pi/Expected/AcceptanceTests/MultiapiCustomBaseUrl/multiapicustombaseurl/v2/_metadata.json
@@ -8,7 +8,8 @@
         "base_url": null,
         "custom_base_url": "\u0027{Endpoint}/multiapiCustomBaseUrl/v2\u0027",
         "azure_arm": false,
-        "has_lro_operations": false
+        "has_lro_operations": false,
+        "client_side_validation": false
     },
     "global_parameters": {
         "sync_method": {

diff --git a/...ultiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_operations_mixin.py b/...ultiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/_operations_mixin.py
@@ -54,6 +54,7 @@ def begin_test_lro(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.begin_test_lro(product, **kwargs)
 
@@ -88,6 +89,7 @@ def begin_test_lro_and_paging(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.begin_test_lro_and_paging(client_request_id, test_lro_and_paging_options, **kwargs)
 
@@ -119,6 +121,7 @@ def test_one(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.test_one(id, message, **kwargs)
 
@@ -142,5 +145,6 @@ def test_paging(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.test_paging(**kwargs)
diff --git a/...api/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_operations_mixin.py b/...api/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/aio/_operations_mixin.py
@@ -50,6 +50,7 @@ async def begin_test_lro(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return await mixin_instance.begin_test_lro(product, **kwargs)
 
@@ -84,6 +85,7 @@ def begin_test_lro_and_paging(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.begin_test_lro_and_paging(client_request_id, test_lro_and_paging_options, **kwargs)
 
@@ -115,6 +117,7 @@ async def test_one(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return await mixin_instance.test_one(id, message, **kwargs)
 
@@ -138,5 +141,6 @@ def test_paging(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.test_paging(**kwargs)
diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v1/_metadata.json
@@ -8,7 +8,8 @@
         "base_url": "\u0027http://localhost:3000\u0027",
         "custom_base_url": null,
         "azure_arm": false,
-        "has_lro_operations": true
+        "has_lro_operations": true,
+        "client_side_validation": false
     },
     "global_parameters": {
         "sync_method": {

diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v2/_metadata.json
@@ -8,7 +8,8 @@
         "base_url": "\u0027http://localhost:3000\u0027",
         "custom_base_url": null,
         "azure_arm": false,
-        "has_lro_operations": false
+        "has_lro_operations": false,
+        "client_side_validation": false
     },
     "global_parameters": {
         "sync_method": {

diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiDataPlane/multiapidataplane/v3/_metadata.json
@@ -8,7 +8,8 @@
         "base_url": "\u0027http://localhost:3000\u0027",
         "custom_base_url": null,
         "azure_arm": false,
-        "has_lro_operations": false
+        "has_lro_operations": false,
+        "client_side_validation": false
     },
     "global_parameters": {
         "sync_method": {

diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_operations_mixin.py b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/_operations_mixin.py
@@ -55,6 +55,7 @@ def begin_test_lro(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.begin_test_lro(product, **kwargs)
 
@@ -89,6 +90,7 @@ def begin_test_lro_and_paging(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.begin_test_lro_and_paging(client_request_id, test_lro_and_paging_options, **kwargs)
 
@@ -120,6 +122,7 @@ def test_one(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.test_one(id, message, **kwargs)
 
@@ -143,5 +146,6 @@ def test_paging(
         mixin_instance._client = self._client
         mixin_instance._config = self._config
         mixin_instance._serialize = Serializer(self._models_dict(api_version))
+        mixin_instance._serialize.client_side_validation = False
         mixin_instance._deserialize = Deserializer(self._models_dict(api_version))
         return mixin_instance.test_paging(**kwargs)
diff --git a/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_metadata.json b/test/multiapi/Expected/AcceptanceTests/MultiapiNoAsync/multiapinoasync/v1/_metadata.json
@@ -8,7 +8,8 @@
         "base_url": "\u0027http://localhost:3000\u0027",
         "custom_base_url": null,
         "azure_arm": true,
-        "has_lro_operations": true
+        "has_lro_operations": true,
+        "client_side_validation": false
     },
     "global_parameters": {
         "sync_method": {