Fix expected alarm dictionary attribute types

The "managementInterfaceId" and "pkNotificationField" are both defined as
arrays of string values.  In the case of the "managementInterfaceId" attribute
the only expected value for O2 is a single array element of "O2IMS".

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

diff --git a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/7.3.2_SMO_succeeds_to_query_inventory_with_O2ims_APIs_and_correct_token.robot b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/7.3.2_SMO_succeeds_to_query_inventory_with_O2ims_APIs_and_correct_token.robot
index b585b16..9affdfa 100644 (file)
--- a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/7.3.2_SMO_succeeds_to_query_inventory_with_O2ims_APIs_and_correct_token.robot
+++ b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/7.3.2_SMO_succeeds_to_query_inventory_with_O2ims_APIs_and_correct_token.robot
@@ -123,7 +123,7 @@ s5, query Resource Type detail
     log      ${res}   level=DEBUG
     Integer     response status    200
     Object       response body
-    String   $.alarmDictionary.managementInterfaceId    "O2IMS"
+    Array   $.alarmDictionary.managementInterfaceId    ["O2IMS"]
 
 s6, query Resource Pool list without filter
     [documentation]  This test case verifies Query OCloud resourcePools without filter

diff --git a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceType_allfields_properties.json b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceType_allfields_properties.json
index 522e8b9..011ecdd 100644 (file)
--- a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceType_allfields_properties.json
+++ b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceType_allfields_properties.json
@@ -41,10 +41,16 @@
                     "type": "string"
                 },
                 "managementInterfaceId": {
-                    "type": "string"
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
                 },
                 "pkNotificationField": {
-                    "type": "string"
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
                 },
                 "alarmDefinition": {
                     "type": "array",
@@ -73,10 +79,16 @@
                                 "type": "string"
                             },
                             "managementInterfaceId": {
-                                "type": "string"
+                                "type": "array",
+                                "items": {
+                                    "type": "string"
+                                }
                             },
                             "pkNotificationField": {
-                                "type": "string"
+                                "type": "array",
+                                "items": {
+                                    "type": "string"
+                                }
                             },
                             "alarmAdditionalFields": {
                                 "type": [

diff --git a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceType_properties.json b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceType_properties.json
index 7ed366e..ee35b96 100644 (file)
--- a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceType_properties.json
+++ b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceType_properties.json
@@ -46,10 +46,16 @@
                     "type": "string"
                 },
                 "managementInterfaceId": {
-                    "type": "string"
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
                 },
                 "pkNotificationField": {
-                    "type": "string"
+                    "type": "array",
+                    "items": {
+                        "type": "string"
+                    }
                 },
                 "alarmDefinition": {
                     "type": "array",
@@ -78,10 +84,16 @@
                                 "type": "string"
                             },
                             "managementInterfaceId": {
-                                "type": "string"
+                                "type": "array",
+                                "items": {
+                                    "type": "string"
+                                }
                             },
                             "pkNotificationField": {
-                                "type": "string"
+                                "type": "array",
+                                "items": {
+                                    "type": "string"
+                                }
                             },
                             "alarmAdditionalFields": {
                                 "type": [

diff --git a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceTypes_allfields_properties.json b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceTypes_allfields_properties.json
index 2d720e6..4d485ff 100644 (file)
--- a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceTypes_allfields_properties.json
+++ b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceTypes_allfields_properties.json
@@ -37,10 +37,16 @@
                         "type": "string"
                     },
                     "managementInterfaceId": {
-                        "type": "string"
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
                     },
                     "pkNotificationField": {
-                        "type": "string"
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
                     },
                     "alarmDefinition": {
                         "type": "array",
@@ -69,10 +75,16 @@
                                     "type": "string"
                                 },
                                 "managementInterfaceId": {
-                                    "type": "string"
+                                    "type": "array",
+                                    "items": {
+                                        "type": "string"
+                                    }
                                 },
                                 "pkNotificationField": {
-                                    "type": "string"
+                                    "type": "array",
+                                    "items": {
+                                        "type": "string"
+                                    }
                                 },
                                 "alarmAdditionalFields": {
                                     "type": [

diff --git a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceTypes_properties.json b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceTypes_properties.json
index 966d4ef..424463f 100644 (file)
--- a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceTypes_properties.json
+++ b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/resourceTypes_properties.json
@@ -44,10 +44,16 @@
                         "type": "string"
                     },
                     "managementInterfaceId": {
-                        "type": "string"
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
                     },
                     "pkNotificationField": {
-                        "type": "string"
+                        "type": "array",
+                        "items": {
+                            "type": "string"
+                        }
                     },
                     "alarmDefinition": {
                         "type": "array",
@@ -76,10 +82,16 @@
                                     "type": "string"
                                 },
                                 "managementInterfaceId": {
-                                    "type": "string"
+                                    "type": "array",
+                                    "items": {
+                                        "type": "string"
+                                    }
                                 },
                                 "pkNotificationField": {
-                                    "type": "string"
+                                    "type": "array",
+                                    "items": {
+                                        "type": "string"
+                                    }
                                 },
                                 "alarmAdditionalFields": {
                                     "type": [