Fix auto bug (#468)

* fix * making changes to add auto hierarchy at the end * bug_fix * update version
open-traffic-generator · Jun 26, 2024 · 72c3196 · 72c3196
1 parent 0658ebf
commit 72c3196
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/openapiart/bundler.py b/openapiart/bundler.py
@@ -862,8 +862,12 @@ def _generate_value_schema(
         }
         if xconstants is not None:
             schema["x-constants"] = copy.deepcopy(xconstants)
-        if "features" in xpattern:
 
+        # TODO: part of temporary auto hack, to be removed later
+        auto_heirarchy = False
+        auto_prop = None
+
+        if "features" in xpattern:
             if "auto" in xpattern["features"]:
                 if "auto" in xpattern:
                     # new enhance for auto hierarchy
@@ -895,10 +899,7 @@ def _generate_value_schema(
                             and auto_prop["default"] is True
                         ):
                             schema["properties"]["choice"]["default"] = "auto"
-                        schema["properties"]["auto"] = {
-                            "$ref": auto_prop["$ref"],
-                            "x-field-uid": auto_field.uid,
-                        }
+                        auto_heirarchy = True
 
                 else:
                     if "default" not in xpattern:
@@ -928,8 +929,8 @@ def _generate_value_schema(
                         property_name="auto",
                     )
 
-            # skip this UID as it was previously being used for metric_groups
-            _ = auto_field.uid
+        # skip this UID as it was previously being used for metric_groups
+        _ = auto_field.uid
 
         if "features" in xpattern and "count" in xpattern["features"]:
             if xpattern["format"] in ["integer", "ipv4", "ipv6", "mac"]:
@@ -1060,6 +1061,13 @@ def _generate_value_schema(
                 metric_tags_schema_name
             ] = metric_tags_schema
 
+        # TODO; temporary hack to add auto hierarchy field at the end, remove later
+        if auto_heirarchy and auto_prop is not None:
+            schema["properties"]["auto"] = {
+                "$ref": auto_prop["$ref"],
+                "x-field-uid": auto_field.uid,
+            }
+
         self._apply_common_x_field_pattern_properties(
             schema["properties"]["value"],
             xpattern,

diff --git a/setup.py b/setup.py
@@ -5,7 +5,7 @@
 import setuptools
 
 pkg_name = "openapiart"
-version = "0.3.13"
+version = "0.3.14"
 
 base_dir = os.path.dirname(os.path.abspath(__file__))
 with open(os.path.join(base_dir, "readme.md")) as fid: