[multiapi combiner] fix for api version validation (Azure#30881)

* fix

* Fix

* update

---------

Co-authored-by: msyyc <70930885+msyyc@users.noreply.github.com>

Author: azure-sdk

sdk/compute/azure-mgmt-compute/tests/test_mgmt_api_version.py

@@ -25,6 +25,11 @@ def test_api_version(self):
         # expect to raise error when method signatue is not supported for the api version
         client = self.client(api_version="2016-04-30-preview")
         signature = inspect.signature(client.availability_sets.list_by_subscription)
-        assert not ("expand" in signature.parameters.keys())
-        
-          
+        result = "expand" in signature.parameters.keys()
+        try:
+          # old package structure
+          assert result == False
+        except AssertionError:
+           # new package structure
+           with pytest.raises(ValueError):
+             client.availability_sets.list_by_subscription(expand="fake_expand")

tools/azure-sdk-tools/packaging_tools/templates/multiapi_combiner/validation.py.jinja2

@@ -16,11 +16,12 @@ def api_version_validation(**kwargs):
         def wrapper(*args, **kwargs):
             func_name = func.__name__
             try:
+                client = args[0]
                 client_api_version = client._get_api_version(func_name)  # pylint: disable=protected-access
             except AttributeError:
-                client_api_version = client._api_version
+                client_api_version = client._api_version  # pylint: disable=protected-access
 
-            if client_api_version not in method_valid_on:
+            if method_valid_on and client_api_version not in method_valid_on:
                 raise ValueError(
                     f"'{func_name}' is not available in API version "
                     f"{client_api_version}. All valid API version are {', '.join(method_valid_on)}."