Minor Model Changes
This change includes a new parameter in the model "vim_uuid"
to facilitate the use of multiple instances of same VIM type.
Signed-off-by: prithiv <prithiv.mohan@intel.com>
diff --git a/osm_mon/core/models/access_cred_OpenStack.json b/osm_mon/core/models/access_cred_OpenStack.json
index 7d1fbbe..5759f8c 100644
--- a/osm_mon/core/models/access_cred_OpenStack.json
+++ b/osm_mon/core/models/access_cred_OpenStack.json
@@ -26,6 +26,7 @@
"vim_type": { "type": "string" },
"access_config":
{
+ "vim_uuid": { "type": "string" },
"openstack_site": { "type" : "string" },
"user": { "type": "string" },
"password": { "type": "string" },
@@ -34,6 +35,7 @@
"required": [ "schema_version",
"schema_type",
"vim_type",
+ "vim_uuid",
"openstack_site",
"user",
"password",
diff --git a/osm_mon/core/models/acknowledge_alarm.json b/osm_mon/core/models/acknowledge_alarm.json
index bc3183b..a3734ee 100644
--- a/osm_mon/core/models/acknowledge_alarm.json
+++ b/osm_mon/core/models/acknowledge_alarm.json
@@ -24,6 +24,7 @@
"schema_version": { "type": "string" },
"schema_type": { "type": "string" },
"vim_type": { "type": "string" },
+ "vim_uuid": { "type": "string" },
"ack_details":
{
"alarm_uuid": { "type": "string" },
@@ -33,7 +34,8 @@
"required": [ "schema_version",
"schema_type",
"vim_type",
+ "vim_uuid",
"alarm_uuid",
"resource_uuid",
"tenant_uuid" ]
-}
\ No newline at end of file
+}
diff --git a/osm_mon/core/models/create_alarm.json b/osm_mon/core/models/create_alarm.json
index 4174061..d7fce88 100644
--- a/osm_mon/core/models/create_alarm.json
+++ b/osm_mon/core/models/create_alarm.json
@@ -23,6 +23,7 @@
"schema_version": { "type": "string" },
"schema_type": { "type": "string" },
"vim_type": { "type": "string "},
+ "vim_uuid": { "type": "string" },
"alarm_create_request":
{
"correlation_id": { "type": "integer" },
@@ -40,6 +41,7 @@
"required": [ "schema_version",
"schema_type",
"vim_type",
+ "vim_uuid",
"correlation_id",
"alarm_name",
"metric_name",
diff --git a/osm_mon/core/models/create_alarm_resp.json b/osm_mon/core/models/create_alarm_resp.json
index 95a125d..f6610db 100644
--- a/osm_mon/core/models/create_alarm_resp.json
+++ b/osm_mon/core/models/create_alarm_resp.json
@@ -22,6 +22,7 @@
{
"schema_version": { "type": "string" },
"schema_type": { "type": "string" },
+ "vim_uuid": { "type": "string" },
"alarm_create_response":
{
"correlation_id": { "type": "integer" },
@@ -30,6 +31,7 @@
},
"required": [ "schema_version",
"schema_type",
+ "vim_uuid",
"correlation_id",
"alarm_uuid",
"status" ]
diff --git a/osm_mon/core/models/create_metric_req.json b/osm_mon/core/models/create_metric_req.json
index b88189a..3710b43 100644
--- a/osm_mon/core/models/create_metric_req.json
+++ b/osm_mon/core/models/create_metric_req.json
@@ -26,6 +26,7 @@
"tenant_uuid": { "type": "string" },
"correlation_id": { "type": "integer" },
"vim_type": { "type": "string" },
+ "vim_uuid": { "type": "string" },
"metric_create":
{
"metric_name": { "type" : "string" },
@@ -36,7 +37,8 @@
"schema_type",
"correlation_id",
"vim_type",
+ "vim_uuid",
"metric_name",
"metric_unit",
"resource_uuid" ]
-}
\ No newline at end of file
+}
diff --git a/osm_mon/core/models/create_metric_resp.json b/osm_mon/core/models/create_metric_resp.json
index 882c496..8e7df4e 100644
--- a/osm_mon/core/models/create_metric_resp.json
+++ b/osm_mon/core/models/create_metric_resp.json
@@ -23,6 +23,7 @@
"schema_version": { "type": "string" },
"schema_type": { "type": "string" },
"correlation_id": { "type": "integer" },
+ "vim_uuid": { "type": "string" },
"metric_create_response":
{
"metric_uuid": { "type": "string" },
@@ -32,6 +33,7 @@
"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 c722990..5683b8d 100644
--- a/osm_mon/core/models/delete_alarm_req.json
+++ b/osm_mon/core/models/delete_alarm_req.json
@@ -23,6 +23,7 @@
"schema_version": { "type": "string" },
"schema_type": { "type": "string" },
"vim_type": { "type": "string" },
+ "vim_uuid": { "type": "string" },
"alarm_delete_request":
{
"alarm_uuid": { "type": "string" },
@@ -31,6 +32,7 @@
"required": [ "schema_version",
"schema_type",
"vim_type",
+ "vim_uuid",
"alarm_uuid",
"correlation_id"
]
diff --git a/osm_mon/core/models/delete_alarm_resp.json b/osm_mon/core/models/delete_alarm_resp.json
index f9b90b3..66d243f 100644
--- a/osm_mon/core/models/delete_alarm_resp.json
+++ b/osm_mon/core/models/delete_alarm_resp.json
@@ -21,6 +21,7 @@
{
"schema_version": { "type": "string" },
"schema_type": { "type": "string" },
+ "vim_uuid": { "type": "string" },
"alarm_deletion_response":
{
"correlation_id": { "type": "integer" },
@@ -30,6 +31,7 @@
"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 f9886de..7e03e72 100644
--- a/osm_mon/core/models/delete_metric_req.json
+++ b/osm_mon/core/models/delete_metric_req.json
@@ -28,11 +28,13 @@
"tenant_uuid": { "type": "string" },
"correlation_id": { "type": "integer" },
"vim_type": { "type": "string" },
+ "vim_uuid": { "type": "string" },
"required": [ "schema_verion",
"schema_type",
"metric_name",
"metric_uuid",
"resource_uuid",
"correlation_id",
- "vim_type" ]
-}
\ No newline at end of file
+ "vim_type",
+ "vim_uuid" ]
+}
diff --git a/osm_mon/core/models/delete_metric_resp.json b/osm_mon/core/models/delete_metric_resp.json
index 741dba0..4d8a8a5 100644
--- a/osm_mon/core/models/delete_metric_resp.json
+++ b/osm_mon/core/models/delete_metric_resp.json
@@ -27,6 +27,7 @@
"resource_uuid": { "type": "string" },
"tenant_uuid": { "type": "string" },
"correlation_id": { "type": "integer" },
+ "vim_uuid": { "type": "string" },
"status": { "type": "boolean" },
"required": [ "schema_version",
"schema_type",
@@ -34,5 +35,6 @@
"metric_uuid",
"resource_uuid",
"status",
- "correlation_id" ]
+ "correlation_id",
+ "vim_uuid" ]
}
diff --git a/osm_mon/core/models/list_alarm_req.json b/osm_mon/core/models/list_alarm_req.json
index 0efe49b..dd46978 100644
--- a/osm_mon/core/models/list_alarm_req.json
+++ b/osm_mon/core/models/list_alarm_req.json
@@ -23,6 +23,7 @@
"schema_version": { "type": "string" },
"schema_type": { "type": "string" },
"vim_type": { "type": "string" },
+ "vim_uuid": { "type": "string" },
"alarm_list_request":
{
"correlation_id": { "type": "integer" },
@@ -33,7 +34,8 @@
"required": [ "schema_version",
"schema_type",
"vim_type",
+ "vim_uuid",
"correlation_id",
"resource_uuid"
]
-}
\ No newline at end of file
+}
diff --git a/osm_mon/core/models/list_alarm_resp.json b/osm_mon/core/models/list_alarm_resp.json
index 2ccd705..cec2ef7 100644
--- a/osm_mon/core/models/list_alarm_resp.json
+++ b/osm_mon/core/models/list_alarm_resp.json
@@ -22,5 +22,7 @@
{
"schema_version": { "type": "string" },
"schema_type": { "type": "string" },
+ "vim_type": { "type": "string" },
+ "vim_uuid": { "type": "string" },
"list_alarm_resp": { "$ref": "definitions.json#/notify_details" }
-}
\ No newline at end of file
+}
diff --git a/osm_mon/core/models/list_metric_req.json b/osm_mon/core/models/list_metric_req.json
index bda8def..fecdde2 100644
--- a/osm_mon/core/models/list_metric_req.json
+++ b/osm_mon/core/models/list_metric_req.json
@@ -23,6 +23,7 @@
"schema_version": { "type": "string" },
"schema_type": { "type": "string" },
"vim_type": { "type": "string" },
+ "vim_uuid": { "type": "string" },
"metrics_list_request":
{
"metric_name": { "type": "string" },
@@ -32,6 +33,7 @@
"required": [ "schema_version",
"schema_type",
"vim_type",
+ "vim_uuid",
"correlation_id"
]
-}
\ No newline at end of file
+}
diff --git a/osm_mon/core/models/list_metric_resp.json b/osm_mon/core/models/list_metric_resp.json
index 9ec198c..4b56f2c 100644
--- a/osm_mon/core/models/list_metric_resp.json
+++ b/osm_mon/core/models/list_metric_resp.json
@@ -25,6 +25,7 @@
"tenant_uuid": { "type": "string" },
"correlation_id": { "type": "integer" },
"vim_type": { "type": "string" },
+ "vim_uuid": { "type": "string" },
"metrics_list":
[{
"type": "array",
@@ -39,8 +40,9 @@
"schema_type",
"correlation_id",
"vim_type",
+ "vim_uuid",
"metric_name",
"metric_uuid",
"metric_unit",
"resource_uuid" ]
-}
\ No newline at end of file
+}
diff --git a/osm_mon/core/models/notify_alarm.json b/osm_mon/core/models/notify_alarm.json
index 52f3107..9497b7f 100644
--- a/osm_mon/core/models/notify_alarm.json
+++ b/osm_mon/core/models/notify_alarm.json
@@ -31,6 +31,7 @@
"description": { "type": "string" },
"tenant_uuid": { "type": "string" },
"vim_type": { "type": "string" },
+ "vim_uuid": { "type": "string" },
"severity": { "type" : "string" },
"status": { "type": "string" },
"start_date": { "type": "string" },
@@ -42,8 +43,9 @@
"alarm_uuid",
"resource_uuid",
"vim_type",
+ "vim_uuid",
"severity",
"status",
"start_date" ]
}
-}
\ No newline at end of file
+}
diff --git a/osm_mon/core/models/read_metric_data_req.json b/osm_mon/core/models/read_metric_data_req.json
index b4e3d62..922b91e 100644
--- a/osm_mon/core/models/read_metric_data_req.json
+++ b/osm_mon/core/models/read_metric_data_req.json
@@ -28,6 +28,7 @@
"tenant_uuid": { "type": "string" },
"correlation_id": { "type": "integer" },
"vim_type": { "type": "string" },
+ "vim_uuid": { "type": "string" },
"collection_period": { "type": "integer" },
"collection_unit": { "type": "string" },
"required": ["schema_version",
@@ -36,6 +37,7 @@
"metric_uuid",
"correlation_id",
"vim_type",
+ "vim_uuid",
"collection_period",
"collection_unit",
"resource_uuid"]
diff --git a/osm_mon/core/models/read_metric_data_resp.json b/osm_mon/core/models/read_metric_data_resp.json
index 43f809f..c851646 100644
--- a/osm_mon/core/models/read_metric_data_resp.json
+++ b/osm_mon/core/models/read_metric_data_resp.json
@@ -27,6 +27,7 @@
"correlation_id": { "type": "integer" },
"resource_uuid": { "type": "string" },
"tenant_uuid": { "type": "string" },
+ "vim_uuid": { "type": "string" },
"metrics_data":
{
"time_series": [{
@@ -55,6 +56,7 @@
"metric_name",
"metric_uuid",
"resource_uuid",
+ "vim_uuid",
"correlation_id",
"time_series",
"metrics_series" ]
diff --git a/osm_mon/core/models/update_alarm_req.json b/osm_mon/core/models/update_alarm_req.json
index 2f19a35..ab5c312 100644
--- a/osm_mon/core/models/update_alarm_req.json
+++ b/osm_mon/core/models/update_alarm_req.json
@@ -23,6 +23,7 @@
"schema_version": { "type": "string" },
"schema_type": { "type": "string" },
"vim_type": { "type": "string" },
+ "vim_uuid": { "type": "string" },
"alarm_update_request":
{
"correlation_id": { "type": "integer" },
@@ -38,7 +39,8 @@
"required": [ "schema_version",
"scema_type",
"vim_type",
+ "vim_uuid",
"correlation_id",
- "alarm_uuid",
- "metric_uuid" ]
+ "alarm_uuid",
+ "metric_uuid" ]
}
diff --git a/osm_mon/core/models/update_alarm_resp.json b/osm_mon/core/models/update_alarm_resp.json
index ea76fa3..8880274 100644
--- a/osm_mon/core/models/update_alarm_resp.json
+++ b/osm_mon/core/models/update_alarm_resp.json
@@ -22,6 +22,7 @@
{
"schema_version": { "type": "string" },
"schema_type": { "type": "string" },
+ "vim_uuid": { "type": "string" },
"alarm_update_response":
{
"correlation_id": { "type": "integer" },
@@ -30,6 +31,7 @@
},
"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 71d4f82..f0f5b97 100644
--- a/osm_mon/core/models/update_metric_req.json
+++ b/osm_mon/core/models/update_metric_req.json
@@ -25,6 +25,7 @@
"tenant_uuid": { "type": "string" },
"correlation_id": { "type": "integer" },
"vim_type": { "type": "string" },
+ "vim_uuid": { "type": "string" },
"metric_create":
{
"metric_name": { "type": "string" },
@@ -35,6 +36,7 @@
"schema_type",
"correlation_id",
"vim_type",
+ "vim_type",
"resource_uuid"
]
-}
\ No newline at end of file
+}
diff --git a/osm_mon/core/models/update_metric_resp.json b/osm_mon/core/models/update_metric_resp.json
index 90e0fa4..3cfd356 100644
--- a/osm_mon/core/models/update_metric_resp.json
+++ b/osm_mon/core/models/update_metric_resp.json
@@ -23,6 +23,7 @@
"schema_version": { "type": "string" },
"schema_type": { "type": "string" },
"correlation_id": { "type": "integer" },
+ "vim_uuid": { "type": "string" },
"metric_update_response":
{
"metric_uuid": { "type": "string" },
@@ -32,7 +33,8 @@
"required": [ "schema_version",
"schema_type",
"correlation_id",
+ "vim_uuid",
"metric_uuid",
"resource_uuid",
"status"]
-}
\ No newline at end of file
+}