feat: Rename choices to choice_set for custom fields #2

ref: 824cab7
fbreckle · Sep 13, 2023 · b56bba8 · b56bba8
1 parent 7d137c4
commit b56bba8
Show file tree

Hide file tree

Showing 5 changed files with 77 additions and 46 deletions.
diff --git a/netbox/models/custom_field.go b/netbox/models/custom_field.go
diff --git a/netbox/models/writable_custom_field.go b/netbox/models/writable_custom_field.go
diff --git a/preprocess.py b/preprocess.py
@@ -549,6 +549,17 @@
 logging.info("Make ASN.rir a full RIR object")
 data["definitions"]["ASN"]["properties"]["rir"] = {"$ref": "#/definitions/NestedRIR"}
 
+# Change custom fields choices to ChoiceSet reference
+logging.info("Change custom field choices to ChoiceSet ref")
+del data["definitions"]["CustomField"]["properties"]["choices"]
+data["definitions"]["CustomField"]["properties"]["choice_set"] = {
+    "$ref": "#/definitions/CustomFieldChoiceSet"
+}
+del data["definitions"]["WritableCustomField"]["properties"]["choices"]
+data["definitions"]["WritableCustomField"]["properties"]["choice_set"] = {
+    "$ref": "#/definitions/CustomFieldChoiceSet"
+}
+
 # Write output file
 with open("swagger.processed.json", "w") as writefile:
     json.dump(data, writefile, indent=2)

diff --git a/swagger.json b/swagger.json
@@ -82654,7 +82654,7 @@
           "type": "string",
           "maxLength": 500
         },
-        "choice_set": {
+        "choices": {
           "description": "Comma-separated list of available choices (for selection fields)",
           "type": "array",
           "items": {
@@ -82831,7 +82831,7 @@
           "type": "string",
           "maxLength": 500
         },
-        "choice_set": {
+        "choices": {
           "description": "Comma-separated list of available choices (for selection fields)",
           "type": "array",
           "items": {

diff --git a/swagger.processed.json b/swagger.processed.json
@@ -81648,17 +81648,6 @@
           "type": "string",
           "maxLength": 500
         },
-        "choice_set": {
-          "description": "Comma-separated list of available choices (for selection fields)",
-          "type": "array",
-          "items": {
-            "title": "Choices",
-            "type": "string",
-            "maxLength": 100,
-            "minLength": 1
-          },
-          "x-nullable": true
-        },
         "created": {
           "title": "Created",
           "type": "string",
@@ -81672,6 +81661,9 @@
           "format": "date-time",
           "readOnly": true,
           "x-nullable": true
+        },
+        "choice_set": {
+          "$ref": "#/definitions/CustomFieldChoiceSet"
         }
       }
     },
@@ -81826,17 +81818,6 @@
           "type": "string",
           "maxLength": 500
         },
-        "choice_set": {
-          "description": "Comma-separated list of available choices (for selection fields)",
-          "type": "array",
-          "items": {
-            "title": "Choices",
-            "type": "string",
-            "maxLength": 100,
-            "minLength": 1
-          },
-          "x-nullable": true
-        },
         "created": {
           "title": "Created",
           "type": "string",
@@ -81850,6 +81831,9 @@
           "format": "date-time",
           "readOnly": true,
           "x-nullable": true
+        },
+        "choice_set": {
+          "$ref": "#/definitions/CustomFieldChoiceSet"
         }
       }
     },