Fix expected deployment manager type definitions

* The "supportedLocations" attribute is defined as an array of strings.

* The "capabilities" and "capacity" attributes are defined as a set of
  key/value pairs which are represented at the API as an object rather than
  a string.

* All of the above fields are mandatory attributes

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

diff --git a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/deploymentManager_allfields_properties.json b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/deploymentManager_allfields_properties.json
index 2b6af8b..438d657 100644 (file)
--- a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/deploymentManager_allfields_properties.json
+++ b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/deploymentManager_allfields_properties.json
@@ -13,6 +13,18 @@
             "type": "string",
             "default": "A DMS"
         },
+        "supportedLocations": {
+            "type": "array",
+            "items": {
+                "type":  "string"
+            }
+        },
+        "capabilities": {
+            "type": "object"
+        },
+        "capacity": {
+            "type": "object"
+        },
         "oCloudId": {
             "type": "string",
             "default": "ce2eec13-24b0-4cca-aa54-548be6cc985b"
@@ -68,9 +80,11 @@
     "required": [
         "deploymentManagerId",
         "description",
-        "extensions",
         "name",
         "oCloudId",
-        "serviceUri"
+        "serviceUri",
+        "supportedLocations",
+        "capabilities",
+        "capacity"
     ]
-}
\ No newline at end of file
+}

diff --git a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/deploymentManager_properties.json b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/deploymentManager_properties.json
index 9ec6b91..3db8f72 100644 (file)
--- a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/deploymentManager_properties.json
+++ b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/deploymentManager_properties.json
@@ -13,6 +13,18 @@
             "type": "string",
             "default": ""
         },
+        "supportedLocations": {
+            "type": "array",
+            "items": {
+                "type":  "string"
+            }
+        },
+        "capabilities": {
+            "type": "object"
+        },
+        "capacity": {
+            "type": "object"
+        },
         "oCloudId": {
             "type": "string",
             "default": ""
@@ -34,6 +46,9 @@
         "description",
         "name",
         "oCloudId",
-        "serviceUri"
+        "serviceUri",
+        "supportedLocations",
+        "capabilities",
+        "capacity"
     ]
-}
\ No newline at end of file
+}

diff --git a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/deploymentManagers_properties.json b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/deploymentManagers_properties.json
index c153e62..f0dfe06 100644 (file)
--- a/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/deploymentManagers_properties.json
+++ b/test_scripts/O2IMS_Compliance_Test/o2ims_compliance/schemas/deploymentManagers_properties.json
@@ -16,13 +16,16 @@
                 "type": "string"
             },
             "supportedLocations": {
-                "type": "string"
+                "type": "array",
+                "items": {
+                    "type":  "string"
+                }
             },
             "capabilities": {
-                "type": "string"
+                "type": "object"
             },
             "capacity": {
-                "type": "string"
+                "type": "object"
             },
             "oCloudId": {
                 "type": "string"
@@ -43,7 +46,10 @@
             "description",
             "name",
             "oCloudId",
-            "serviceUri"
+            "serviceUri",
+            "supportedLocations",
+            "capabilities",
+            "capacity"
         ]
     }
 }