Fix extension type to include null and object

Since extensions are optional fields they can either be of type "null"
or "object" depending on whether the server has provided a value.

Issue-ID: INT-162
Change-Id: I1d6dc1ed7c1e86d23ecdebeb583a544e89b05e50
Signed-off-by: Allain Legacy <alegacy@redhat.com>

diff --git a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/ocloud_allfields_properties.json b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/ocloud_allfields_properties.json
index c59b287..1067288 100644 (file)
--- a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/ocloud_allfields_properties.json
+++ b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/ocloud_allfields_properties.json
@@ -22,7 +22,10 @@
             "default": "http://128.224.115.23:30205"
         },
         "extensions": {
-            "type": "null",
+            "type": [
+                "null",
+                "object"
+            ],
             "default": null
         }
     },
@@ -34,4 +37,4 @@
         "oCloudId",
         "serviceUri"
     ]
-}
\ No newline at end of file
+}

diff --git a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourcePool_allfields_properties.json b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourcePool_allfields_properties.json
index d430509..ee0b88b 100644 (file)
--- a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourcePool_allfields_properties.json
+++ b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourcePool_allfields_properties.json
@@ -26,7 +26,10 @@
             "default": ""
         },
         "extensions": {
-            "type": "null",
+            "type": [
+                "null",
+                "object"
+            ],
             "default": null
         }
     },
@@ -39,4 +42,4 @@
         "oCloudId",
         "resourcePoolId"
     ]
-}
\ No newline at end of file
+}

diff --git a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourcePool_properties.json b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourcePool_properties.json
index 5bd0e1f..40fa0e2 100644 (file)
--- a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourcePool_properties.json
+++ b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourcePool_properties.json
@@ -30,7 +30,10 @@
             "default": []
         },
         "extensions": {
-            "type": "null",
+            "type": [
+                "null",
+                "object"
+            ],
             "default": null
         }
     },
@@ -41,4 +44,4 @@
         "resourcePoolId",
         "oCloudId"
     ]
-}
\ No newline at end of file
+}

diff --git a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourcePools_properties.json b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourcePools_properties.json
index 4841c35..f0a541e 100644 (file)
--- a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourcePools_properties.json
+++ b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourcePools_properties.json
@@ -27,7 +27,10 @@
                 "default": []
             },
             "extensions": {
-                "type": "null",
+                "type": [
+                    "null",
+                    "object"
+                    ],
                 "default": null
             }
         },
@@ -39,4 +42,4 @@
             "oCloudId"
         ]
     }
-}
\ No newline at end of file
+}

diff --git a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceTypes_field3_properties.json b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceTypes_field3_properties.json
index e475216..034346e 100644 (file)
--- a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceTypes_field3_properties.json
+++ b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceTypes_field3_properties.json
@@ -25,7 +25,10 @@
                 "type": "string"
             },
             "extensions": {
-                "type": "null"
+                "type": [
+                    "null",
+                    "object"
+                ]
             }
         },
         "required": [
@@ -37,4 +40,4 @@
         ]
     },
     "examples": []
-}
\ No newline at end of file
+}

diff --git a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceTypes_field4_properties.json b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceTypes_field4_properties.json
index accdc43..c3b5fa5 100644 (file)
--- a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceTypes_field4_properties.json
+++ b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceTypes_field4_properties.json
@@ -31,7 +31,10 @@
                 "type": "string"
             },
             "extensions": {
-                "type": "object"
+                "type": [
+                    "null",
+                    "object"
+                ]
             }
         },
         "required": [