Fix: schema auto generated documentation and json schema (#2251)

Co-authored-by: Claus Holbech <[email protected]>

ansible_collections/arista/avd/plugins/plugin_utils/schema/avdtodocumentationschemaconverter.py

@@ -304,10 +304,10 @@ def items(self, schema: dict, indentation: int, var_path: list, table: str):
 
     def required(self, schema: dict, var_name: str, parent_schema: dict):
         output = None
-        if schema.get("required"):
+        if parent_schema and parent_schema.get("primary_key") == var_name:
+            output = "Required, Unique"
+        elif schema.get("required"):
             output = "Required"
-            if parent_schema and parent_schema.get("primary_key") == var_name:
-                output = "Required, Unique"
         return output
 
     def default(self, schema: dict):

ansible_collections/arista/avd/plugins/plugin_utils/schema/avdtojsonschemaconverter.py

@@ -137,10 +137,13 @@ def convert_default(self, default, parent_schema: dict) -> dict:
         return {"default": default}
 
     def convert_items(self, items: dict, parent_schema: dict) -> dict:
-        output = {"items": {}}
-        output["items"] = self.convert_schema(items)
-        if (primary_key := parent_schema.get("primary_key")) and output["items"]["type"] == "dict":
-            output["items"]["keys"][primary_key]["required"] = True
+        output = {
+            "items": self.convert_schema(items),
+        }
+        if (primary_key := parent_schema.get("primary_key")) and items.get("type") == "dict":
+            output["items"].setdefault("required", [])
+            if primary_key not in output["items"]["required"]:
+                output["items"]["required"].append(primary_key)
         return output
 
     def convert_display_name(self, display_name: str, parent_schema: dict) -> dict: