Fixes discrepancies and missing params in JSON models
Updates JSON models to be up to date with the params required by MON.
It constitutes a first step in the process of converting JSON models
to actual JSON Schema files.
Signed-off-by: Benjamin Diaz <bdiaz@whitestack.com>
Change-Id: I9c3c0b69ee59e98805fb3f92f69d01f4fb142913
diff --git a/osm_mon/core/models/acknowledge_alarm.json b/osm_mon/core/models/acknowledge_alarm.json
index 6a05f07..8a9e50a 100644
--- a/osm_mon/core/models/acknowledge_alarm.json
+++ b/osm_mon/core/models/acknowledge_alarm.json
@@ -36,5 +36,6 @@
"schema_type",
"alarm_uuid",
"ns_id",
- "vnf_member_index" ]
+ "vnf_member_index",
+ "vdu_name"]
}
diff --git a/osm_mon/core/models/create_alarm_resp.json b/osm_mon/core/models/create_alarm_resp.json
index f6610db..95a125d 100644
--- a/osm_mon/core/models/create_alarm_resp.json
+++ b/osm_mon/core/models/create_alarm_resp.json
@@ -22,7 +22,6 @@
{
"schema_version": { "type": "string" },
"schema_type": { "type": "string" },
- "vim_uuid": { "type": "string" },
"alarm_create_response":
{
"correlation_id": { "type": "integer" },
@@ -31,7 +30,6 @@
},
"required": [ "schema_version",
"schema_type",
- "vim_uuid",
"correlation_id",
"alarm_uuid",
"status" ]
diff --git a/osm_mon/core/models/create_metric_resp.json b/osm_mon/core/models/create_metric_resp.json
index bbe36ea..5b67955 100644
--- a/osm_mon/core/models/create_metric_resp.json
+++ b/osm_mon/core/models/create_metric_resp.json
@@ -25,13 +25,12 @@
"metric_create_response":
{
"correlation_id": { "type": "integer" },
+ "metric_uuid": { "type": "string" },
"status": { "type": "boolean" }
},
"required": [ "schema_type",
"schema_version",
"correlation_id",
- "vim_uuid",
"metric_uuid",
- "resource_uuid",
"status" ]
}
diff --git a/osm_mon/core/models/delete_alarm_req.json b/osm_mon/core/models/delete_alarm_req.json
index 8c3d88b..44dab0a 100644
--- a/osm_mon/core/models/delete_alarm_req.json
+++ b/osm_mon/core/models/delete_alarm_req.json
@@ -27,12 +27,14 @@
"correlation_id": { "type": "integer" },
"alarm_uuid": { "type": "string" },
"ns_id": { "type": "string"},
+ "vdu_name": { "type": "string"},
"vnf_member_index": { "type": "integer"}
},
"required": [ "schema_version",
"schema_type",
"alarm_uuid",
"ns_id",
+ "vdu_name",
"vnf_member_index",
"correlation_id"
]
diff --git a/osm_mon/core/models/delete_alarm_resp.json b/osm_mon/core/models/delete_alarm_resp.json
index 66d243f..5b931f2 100644
--- a/osm_mon/core/models/delete_alarm_resp.json
+++ b/osm_mon/core/models/delete_alarm_resp.json
@@ -21,17 +21,15 @@
{
"schema_version": { "type": "string" },
"schema_type": { "type": "string" },
- "vim_uuid": { "type": "string" },
"alarm_deletion_response":
{
"correlation_id": { "type": "integer" },
"alarm_uuid": { "type": "string" },
- "status": { "type": "string" }
+ "status": { "type": "boolean" }
},
"required": [ "schema_version",
"schema_type",
"correlation_id",
- "vim_uuid",
"alarm_uuid",
"status" ]
}
diff --git a/osm_mon/core/models/delete_metric_req.json b/osm_mon/core/models/delete_metric_req.json
index 077646e..2c51042 100644
--- a/osm_mon/core/models/delete_metric_req.json
+++ b/osm_mon/core/models/delete_metric_req.json
@@ -30,9 +30,8 @@
"required": [ "schema_version",
"schema_type",
"metric_name",
- "metric_uuid",
- "resource_uuid",
- "correlation_id",
- "vim_type",
- "vim_uuid" ]
+ "ns_id",
+ "vdu_name",
+ "vnf_member_index",
+ "correlation_id" ]
}
diff --git a/osm_mon/core/models/delete_metric_resp.json b/osm_mon/core/models/delete_metric_resp.json
index 4d8a8a5..dc99059 100644
--- a/osm_mon/core/models/delete_metric_resp.json
+++ b/osm_mon/core/models/delete_metric_resp.json
@@ -25,9 +25,7 @@
"metric_name": { "type": "string" },
"metric_uuid": { "type": "string" },
"resource_uuid": { "type": "string" },
- "tenant_uuid": { "type": "string" },
"correlation_id": { "type": "integer" },
- "vim_uuid": { "type": "string" },
"status": { "type": "boolean" },
"required": [ "schema_version",
"schema_type",
@@ -35,6 +33,5 @@
"metric_uuid",
"resource_uuid",
"status",
- "correlation_id",
- "vim_uuid" ]
+ "correlation_id"]
}
diff --git a/osm_mon/core/models/list_alarm_req.json b/osm_mon/core/models/list_alarm_req.json
index 7ecc127..a856374 100644
--- a/osm_mon/core/models/list_alarm_req.json
+++ b/osm_mon/core/models/list_alarm_req.json
@@ -33,9 +33,9 @@
},
"required": [ "schema_version",
"schema_type",
- "vim_type",
- "vim_uuid",
- "correlation_id",
- "resource_uuid"
+ "ns_id",
+ "vdu_name",
+ "vnf_member_index",
+ "correlation_id"
]
}
diff --git a/osm_mon/core/models/list_alarm_resp.json b/osm_mon/core/models/list_alarm_resp.json
index 077e24c..66eaeb3 100644
--- a/osm_mon/core/models/list_alarm_resp.json
+++ b/osm_mon/core/models/list_alarm_resp.json
@@ -22,7 +22,5 @@
{
"schema_version": { "type": "string" },
"schema_type": { "type": "string" },
- "vim_type": { "type": "string" },
- "vim_uuid": { "type": "string" },
"list_alarm_response": { "$ref": "definitions.json#/notify_details" }
}
diff --git a/osm_mon/core/models/list_metric_req.json b/osm_mon/core/models/list_metric_req.json
index 9612e44..7474956 100644
--- a/osm_mon/core/models/list_metric_req.json
+++ b/osm_mon/core/models/list_metric_req.json
@@ -32,8 +32,9 @@
},
"required": [ "schema_version",
"schema_type",
- "vim_type",
- "vim_uuid",
+ "ns_id",
+ "vdu_name",
+ "vnf_member_index",
"correlation_id"
]
}
diff --git a/osm_mon/core/models/list_metric_resp.json b/osm_mon/core/models/list_metric_resp.json
index 4b56f2c..e8c933d 100644
--- a/osm_mon/core/models/list_metric_resp.json
+++ b/osm_mon/core/models/list_metric_resp.json
@@ -22,10 +22,8 @@
{
"schema_version": { "type": "string" },
"schema_type": { "type": "string" },
- "tenant_uuid": { "type": "string" },
"correlation_id": { "type": "integer" },
- "vim_type": { "type": "string" },
- "vim_uuid": { "type": "string" },
+ "status": { "type": "boolean" },
"metrics_list":
[{
"type": "array",
@@ -39,8 +37,6 @@
"required": [ "schema_version",
"schema_type",
"correlation_id",
- "vim_type",
- "vim_uuid",
"metric_name",
"metric_uuid",
"metric_unit",
diff --git a/osm_mon/core/models/notify_alarm.json b/osm_mon/core/models/notify_alarm.json
index ae39a78..62efa50 100644
--- a/osm_mon/core/models/notify_alarm.json
+++ b/osm_mon/core/models/notify_alarm.json
@@ -42,8 +42,6 @@
"schema_type",
"alarm_uuid",
"resource_uuid",
- "vim_type",
- "vim_uuid",
"severity",
"status",
"start_date" ]
diff --git a/osm_mon/core/models/read_metric_data_req.json b/osm_mon/core/models/read_metric_data_req.json
index 7964163..6214569 100644
--- a/osm_mon/core/models/read_metric_data_req.json
+++ b/osm_mon/core/models/read_metric_data_req.json
@@ -34,9 +34,9 @@
"metric_name",
"metric_uuid",
"correlation_id",
- "vim_type",
- "vim_uuid",
"collection_period",
"collection_unit",
- "resource_uuid"]
+ "ns_id",
+ "vdu_name",
+ "vnf_member_index"]
}
diff --git a/osm_mon/core/models/read_metric_data_resp.json b/osm_mon/core/models/read_metric_data_resp.json
index c851646..2a96b76 100644
--- a/osm_mon/core/models/read_metric_data_resp.json
+++ b/osm_mon/core/models/read_metric_data_resp.json
@@ -26,8 +26,7 @@
"metric_uuid": { "type": "string" },
"correlation_id": { "type": "integer" },
"resource_uuid": { "type": "string" },
- "tenant_uuid": { "type": "string" },
- "vim_uuid": { "type": "string" },
+ "status": { "type": "boolean" },
"metrics_data":
{
"time_series": [{
@@ -35,8 +34,7 @@
"properties":
{ "time_stamp":
{ "type": "integer" }}}
- ]
- },
+ ],
"metrics_series": [{
"type": "array",
"properties":
@@ -50,14 +48,15 @@
}
}
],
+ },
"unit": { "type": "string" },
"required": [ "schema_version",
"schema_type",
"metric_name",
"metric_uuid",
"resource_uuid",
- "vim_uuid",
"correlation_id",
"time_series",
- "metrics_series" ]
+ "metrics_series",
+ "status" ]
}
diff --git a/osm_mon/core/models/update_alarm_req.json b/osm_mon/core/models/update_alarm_req.json
index f71766f..9760bae 100644
--- a/osm_mon/core/models/update_alarm_req.json
+++ b/osm_mon/core/models/update_alarm_req.json
@@ -25,7 +25,6 @@
"alarm_update_request":
{
"correlation_id": { "type": "integer" },
- "vim_uuid": { "type": "string" },
"alarm_uuid": { "type": "string" },
"metric_name": { "type": "string" },
"ns_id": { "type": "string"},
@@ -39,9 +38,10 @@
},
"required": [ "schema_version",
"schema_type",
- "vim_type",
- "vim_uuid",
"correlation_id",
- "alarm_uuid",
- "metric_uuid" ]
+ "alarm_uuid",
+ "metric_uuid",
+ "ns_id",
+ "vdu_name",
+ "vnf_member_index"]
}
diff --git a/osm_mon/core/models/update_alarm_resp.json b/osm_mon/core/models/update_alarm_resp.json
index 8880274..b0e3e60 100644
--- a/osm_mon/core/models/update_alarm_resp.json
+++ b/osm_mon/core/models/update_alarm_resp.json
@@ -22,16 +22,14 @@
{
"schema_version": { "type": "string" },
"schema_type": { "type": "string" },
- "vim_uuid": { "type": "string" },
"alarm_update_response":
{
"correlation_id": { "type": "integer" },
"alarm_uuid": { "type": "string" },
- "status": { "type": "string" }
+ "status": { "type": "boolean" }
},
"required": [ "schema_version",
"schema_type",
- "vim_uuid",
"correlation_id",
"alarm_uuid",
"status" ]
diff --git a/osm_mon/core/models/update_metric_req.json b/osm_mon/core/models/update_metric_req.json
index 2a76722..7c0eba3 100644
--- a/osm_mon/core/models/update_metric_req.json
+++ b/osm_mon/core/models/update_metric_req.json
@@ -22,8 +22,6 @@
{
"schema_version": { "type": "string" },
"schema_type": { "type": "string" },
- "vim_type": { "type": "string" },
- "vim_uuid": { "type": "string" },
"metric_update_request":
{
"correlation_id": { "type": "integer" },
@@ -36,8 +34,10 @@
"required": [ "schema_version",
"schema_type",
"correlation_id",
- "vim_type",
- "vim_type",
- "resource_uuid"
+ "metric_name",
+ "metric_unit",
+ "ns_id",
+ "vdu_name",
+ "vnf_member_index"
]
}
diff --git a/osm_mon/core/models/update_metric_resp.json b/osm_mon/core/models/update_metric_resp.json
index 3cfd356..a5bdb67 100644
--- a/osm_mon/core/models/update_metric_resp.json
+++ b/osm_mon/core/models/update_metric_resp.json
@@ -23,7 +23,6 @@
"schema_version": { "type": "string" },
"schema_type": { "type": "string" },
"correlation_id": { "type": "integer" },
- "vim_uuid": { "type": "string" },
"metric_update_response":
{
"metric_uuid": { "type": "string" },
@@ -33,7 +32,6 @@
"required": [ "schema_version",
"schema_type",
"correlation_id",
- "vim_uuid",
"metric_uuid",
"resource_uuid",
"status"]