Implement Enhancements to the Microservice

Change-Id: Ie3b11fe14f1794fdd6880c40bc382eccbef34aa2
Issue-ID: DCAEGEN2-1109
Signed-off-by: krishna moorthy <krishna.moorthy6@wipro.com>

13 files changed, 682 insertions, 682 deletions

diff --git a/dpo/data-formats/cellListFromSdnr-dataformat.json b/dpo/data-formats/cellListFromSdnr-dataformat.json
index 610552e..1875be8 100644
--- a/dpo/data-formats/cellListFromSdnr-dataformat.json
+++ b/dpo/data-formats/cellListFromSdnr-dataformat.json
@@ -1,18 +1,18 @@
 {
-    "dataformatversion": "1.0.0", 
-    "jsonschema": {
-        "$schema": "http://json-schema.org/draft-04/schema#", 
-        "description": "", 
-        "items": {
-            "description": "", 
-            "type": "string"
-        }, 
-        "type": "array"
-    }, 
-    "self": {
-        "description": "", 
-        "name": "CELLLIST_FROM_SDNR", 
-        "version": "1.0.0"
-    }
+	"dataformatversion": "1.0.0",
+	"jsonschema": {
+		"$schema": "http://json-schema.org/draft-04/schema#",
+		"description": "",
+		"items": {
+			"description": "",
+			"type": "string"
+		},
+		"type": "array"
+	},
+	"self": {
+		"description": "",
+		"name": "CELLLIST_FROM_SDNR",
+		"version": "1.0.0"
+	}
 }
 
diff --git a/dpo/data-formats/configdb-req-dataformat.json b/dpo/data-formats/configdb-req-dataformat.json
index a40a05c..9549541 100644
--- a/dpo/data-formats/configdb-req-dataformat.json
+++ b/dpo/data-formats/configdb-req-dataformat.json
@@ -1,12 +1,11 @@
 {
-    "self": {
-        "name": "CONFIGDB-REQ",
-        "version": "1.0.0",
-        "description": "Request to config DB"
-
-    },
-    "dataformatversion": "1.0.0",
-    "unstructured": {
-        "encoding": "UTF-8"
-    }
+	"self": {
+		"name": "CONFIGDB-REQ",
+		"version": "1.0.0",
+		"description": "Request to config DB"
+	},
+	"dataformatversion": "1.0.0",
+	"unstructured": {
+		"encoding": "UTF-8"
+	}
 }
diff --git a/dpo/data-formats/dmaap_son.json b/dpo/data-formats/dmaap_son.json
index 43f7b8e..7e4a950 100644
--- a/dpo/data-formats/dmaap_son.json
+++ b/dpo/data-formats/dmaap_son.json
@@ -1,45 +1,46 @@
-{"nbr_list_change_topic":{
-    "type": "message_router",
-    "aaf_username": "",
-    "aaf_password": "",
-    "dmaap_info": {
-        "client_role": "son-subscriber",
-        "client_id": "sdnr-son-1",
-        "location": "onap",
-        "topic_url": "https://HOSTNAME:3905/events/PCI-NOTIF-TOPIC-NGHBR-LIST-CHANGE-INFO"
-    }
-},
-"fault_management_topic":{
-    "type": "message_router",
-    "aaf_username": "",
-    "aaf_password": "",
-    "dmaap_info": {
-        "client_role": "son-subscriber",
-        "client_id": "sdnr-son-1",
-        "location": "onap",
-        "topic_url": "https://HOSTNAME:3905/events/unauthenticated.SEC_FAULT_OUTPUT"
-    }
-},
-"performance_management_topic":{
-    "type": "message_router",
-    "aaf_username": "",
-    "aaf_password": "",
-    "dmaap_info": {
-        "client_role": "son-subscriber",
-        "client_id": "sdnr-son-1",
-        "location": "onap",
-        "topic_url": "https://HOSTNAME:3905/events/unauthenticated.SEC_MEASUREMENT_OUTPUT"
-    }
-},
-"CL_topic":{
-    "type": "message_router",
-    "aaf_username": "",
-    "aaf_password": "",
-    "dmaap_info": {
-        "client_role": "policy-publisher",
-        "client_id": "policy-son-1",
-        "location": "onap",
-        "topic_url": "https://HOSTNAME:3905/events/DCAE_CL_OUTPUT"
-    }
-}
+{
+	"nbr_list_change_topic": {
+		"type": "message_router",
+		"aaf_username": "",
+		"aaf_password": "",
+		"dmaap_info": {
+			"client_role": "son-subscriber",
+			"client_id": "sdnr-son-1",
+			"location": "onap",
+			"topic_url": "https://HOSTNAME:3905/events/PCI-NOTIF-TOPIC-NGHBR-LIST-CHANGE-INFO"
+		}
+	},
+	"fault_management_topic": {
+		"type": "message_router",
+		"aaf_username": "",
+		"aaf_password": "",
+		"dmaap_info": {
+			"client_role": "son-subscriber",
+			"client_id": "sdnr-son-1",
+			"location": "onap",
+			"topic_url": "https://HOSTNAME:3905/events/unauthenticated.SEC_FAULT_OUTPUT"
+		}
+	},
+	"performance_management_topic": {
+		"type": "message_router",
+		"aaf_username": "",
+		"aaf_password": "",
+		"dmaap_info": {
+			"client_role": "son-subscriber",
+			"client_id": "sdnr-son-1",
+			"location": "onap",
+			"topic_url": "https://HOSTNAME:3905/events/unauthenticated.SEC_MEASUREMENT_OUTPUT"
+		}
+	},
+	"CL_topic": {
+		"type": "message_router",
+		"aaf_username": "",
+		"aaf_password": "",
+		"dmaap_info": {
+			"client_role": "policy-publisher",
+			"client_id": "policy-son-1",
+			"location": "onap",
+			"topic_url": "https://HOSTNAME:3905/events/DCAE_CL_OUTPUT"
+		}
+	}
 }
diff --git a/dpo/data-formats/nbrListFromSdnr-dataformat.json b/dpo/data-formats/nbrListFromSdnr-dataformat.json
index ad50950..b32ea1f 100644
--- a/dpo/data-formats/nbrListFromSdnr-dataformat.json
+++ b/dpo/data-formats/nbrListFromSdnr-dataformat.json
@@ -1,33 +1,33 @@
 {
-    "dataformatversion": "1.0.0", 
-    "jsonschema": {
-        "$schema": "http://json-schema.org/draft-04/schema#", 
-        "description": "", 
-        "items": {
-            "additionalproperties": true, 
-            "description": "", 
-            "properties": {
-                "cellId": {
-                    "description": "", 
-                    "type": "string"
-                }, 
-                "pciValue": {
-                    "description": "", 
-                    "type": "integer"
-                }
-            }, 
-            "required": [
-                "cellId", 
-                "pciValue"
-            ], 
-            "type": "object"
-        }, 
-        "type": "array"
-    }, 
-    "self": {
-        "description": "", 
-        "name": "NBRLST_FROM_SDNR", 
-        "version": "1.0.0"
-    }
+	"dataformatversion": "1.0.0",
+	"jsonschema": {
+		"$schema": "http://json-schema.org/draft-04/schema#",
+		"description": "",
+		"items": {
+			"additionalproperties": true,
+			"description": "",
+			"properties": {
+				"cellId": {
+					"description": "",
+					"type": "string"
+				},
+				"pciValue": {
+					"description": "",
+					"type": "integer"
+				}
+			},
+			"required": [
+				"cellId",
+				"pciValue"
+			],
+			"type": "object"
+		},
+		"type": "array"
+	},
+	"self": {
+		"description": "",
+		"name": "NBRLST_FROM_SDNR",
+		"version": "1.0.0"
+	}
 }
 
diff --git a/dpo/data-formats/oofToSonAsyncResp-dataformat.json b/dpo/data-formats/oofToSonAsyncResp-dataformat.json
index 2668370..bf99528 100644
--- a/dpo/data-formats/oofToSonAsyncResp-dataformat.json
+++ b/dpo/data-formats/oofToSonAsyncResp-dataformat.json
@@ -1,91 +1,91 @@
 {
-    "dataformatversion": "1.0.0", 
-    "jsonschema": {
-        "$schema": "http://json-schema.org/draft-04/schema#", 
-        "additionalproperties": true, 
-        "description": "", 
-        "properties": {
-            "requestId": {
-                "description": "", 
-                "type": "string"
-            }, 
-            "requestStatus": {
-                "description": "", 
-                "type": "string"
-            }, 
-            "solutions": {
-                "description": "", 
-                "items": {
-                    "additionalproperties": true, 
-                    "description": "", 
-                    "properties": {
-                        "finishTime": {
-                            "description": "", 
-                            "type": "string"
-                        }, 
-                        "networkId": {
-                            "description": "", 
-                            "type": "string"
-                        }, 
-                        "pciSolutions": {
-                            "description": "", 
-                            "items": {
-                                "additionalproperties": true, 
-                                "description": "", 
-                                "properties": {
-                                    "cellId": {
-                                        "description": "", 
-                                        "type": "string"
-                                    }, 
-                                    "pci": {
-                                        "description": "", 
-                                        "type": "string"
-                                    }
-                                }, 
-                                "required": [
-                                    "cellId", 
-                                    "pci"
-                                ], 
-                                "type": "object"
-                            }, 
-                            "type": "array"
-                        }, 
-                        "startTime": {
-                            "description": "", 
-                            "type": "string"
-                        }
-                    }, 
-                    "required": [
-                        "finishTime", 
-                        "networkId", 
-                        "pciSolutions", 
-                        "startTime"
-                    ], 
-                    "type": "object"
-                }, 
-                "type": "array"
-            }, 
-            "statusMessage": {
-                "description": "", 
-                "type": "string"
-            }, 
-            "transactionId": {
-                "description": "", 
-                "type": "string"
-            }
-        }, 
-        "required": [
-            "requestId", 
-            "requestStatus", 
-            "solutions", 
-            "statusMessage", 
-            "transactionId"
-        ], 
-        "type": "object"
-    }, 
-    "self": {
-        "description": "", 
-        "name": "SON_OOF_ASYNC_RESP", 
-        "version": "1.0.0"
-    }
+	"dataformatversion": "1.0.0",
+	"jsonschema": {
+		"$schema": "http://json-schema.org/draft-04/schema#",
+		"additionalproperties": true,
+		"description": "",
+		"properties": {
+			"requestId": {
+				"description": "",
+				"type": "string"
+			},
+			"requestStatus": {
+				"description": "",
+				"type": "string"
+			},
+			"solutions": {
+				"description": "",
+				"items": {
+					"additionalproperties": true,
+					"description": "",
+					"properties": {
+						"finishTime": {
+							"description": "",
+							"type": "string"
+						},
+						"networkId": {
+							"description": "",
+							"type": "string"
+						},
+						"pciSolutions": {
+							"description": "",
+							"items": {
+								"additionalproperties": true,
+								"description": "",
+								"properties": {
+									"cellId": {
+										"description": "",
+										"type": "string"
+									},
+									"pci": {
+										"description": "",
+										"type": "string"
+									}
+								},
+								"required": [
+									"cellId",
+									"pci"
+								],
+								"type": "object"
+							},
+							"type": "array"
+						},
+						"startTime": {
+							"description": "",
+							"type": "string"
+						}
+					},
+					"required": [
+						"finishTime",
+						"networkId",
+						"pciSolutions",
+						"startTime"
+					],
+					"type": "object"
+				},
+				"type": "array"
+			},
+			"statusMessage": {
+				"description": "",
+				"type": "string"
+			},
+			"transactionId": {
+				"description": "",
+				"type": "string"
+			}
+		},
+		"required": [
+			"requestId",
+			"requestStatus",
+			"solutions",
+			"statusMessage",
+			"transactionId"
+		],
+		"type": "object"
+	},
+	"self": {
+		"description": "",
+		"name": "SON_OOF_ASYNC_RESP",
+		"version": "1.0.0"
+	}
 }
diff --git a/dpo/data-formats/oofToSonSyncResp-dataformat.json b/dpo/data-formats/oofToSonSyncResp-dataformat.json
index 11f8cd0..9f15a06 100644
--- a/dpo/data-formats/oofToSonSyncResp-dataformat.json
+++ b/dpo/data-formats/oofToSonSyncResp-dataformat.json
@@ -1,38 +1,38 @@
 {
-    "dataformatversion": "1.0.0", 
-    "jsonschema": {
-        "$schema": "http://json-schema.org/draft-04/schema#", 
-        "additionalproperties": true, 
-        "description": "", 
-        "properties": {
-            "requestId": {
-                "description": "", 
-                "type": "string"
-            }, 
-            "requestStatus": {
-                "description": "", 
-                "type": "string"
-            }, 
-            "statusMessage": {
-                "description": "", 
-                "type": "string"
-            }, 
-            "transactionId": {
-                "description": "", 
-                "type": "string"
-            }
-        }, 
-        "required": [
-            "requestId", 
-            "requestStatus", 
-            "statusMessage", 
-            "transactionId"
-        ], 
-        "type": "object"
-    }, 
-    "self": {
-        "description": "", 
-        "name": "SON_OOF_SYNC_RESP", 
-        "version": "1.0.0"
-    }
+	"dataformatversion": "1.0.0",
+	"jsonschema": {
+		"$schema": "http://json-schema.org/draft-04/schema#",
+		"additionalproperties": true,
+		"description": "",
+		"properties": {
+			"requestId": {
+				"description": "",
+				"type": "string"
+			},
+			"requestStatus": {
+				"description": "",
+				"type": "string"
+			},
+			"statusMessage": {
+				"description": "",
+				"type": "string"
+			},
+			"transactionId": {
+				"description": "",
+				"type": "string"
+			}
+		},
+		"required": [
+			"requestId",
+			"requestStatus",
+			"statusMessage",
+			"transactionId"
+		],
+		"type": "object"
+	},
+	"self": {
+		"description": "",
+		"name": "SON_OOF_SYNC_RESP",
+		"version": "1.0.0"
+	}
 }
diff --git a/dpo/data-formats/pciFromSdnr-dataformat.json b/dpo/data-formats/pciFromSdnr-dataformat.json
index 5eb8e7c..111d55a 100644
--- a/dpo/data-formats/pciFromSdnr-dataformat.json
+++ b/dpo/data-formats/pciFromSdnr-dataformat.json
@@ -1,29 +1,29 @@
 {
-    "dataformatversion": "1.0.0", 
-    "jsonschema": {
-        "$schema": "http://json-schema.org/draft-04/schema#", 
-        "additionalproperties": true, 
-        "description": "", 
-        "properties": {
-            "attribute-name": {
-                "description": "", 
-                "type": "string"
-            }, 
-            "value": {
-                "description": "", 
-                "type": "string"
-            }
-        }, 
-        "required": [
-            "attribute-name", 
-            "value"
-        ], 
-        "type": "object"
-    }, 
-    "self": {
-        "description": "", 
-        "name": "PCI_FROM_SDNR", 
-        "version": "1.0.0"
-    }
+	"dataformatversion": "1.0.0",
+	"jsonschema": {
+		"$schema": "http://json-schema.org/draft-04/schema#",
+		"additionalproperties": true,
+		"description": "",
+		"properties": {
+			"attribute-name": {
+				"description": "",
+				"type": "string"
+			},
+			"value": {
+				"description": "",
+				"type": "string"
+			}
+		},
+		"required": [
+			"attribute-name",
+			"value"
+		],
+		"type": "object"
+	},
+	"self": {
+		"description": "",
+		"name": "PCI_FROM_SDNR",
+		"version": "1.0.0"
+	}
 }
 
diff --git a/dpo/data-formats/pnfNameFromSdnr-dataformat.json b/dpo/data-formats/pnfNameFromSdnr-dataformat.json
index 84787dc..4f9f1d6 100644
--- a/dpo/data-formats/pnfNameFromSdnr-dataformat.json
+++ b/dpo/data-formats/pnfNameFromSdnr-dataformat.json
@@ -1,29 +1,29 @@
 {
-    "dataformatversion": "1.0.0", 
-    "jsonschema": {
-        "$schema": "http://json-schema.org/draft-04/schema#", 
-        "additionalproperties": true, 
-        "description": "", 
-        "properties": {
-            "attribute-name": {
-                "description": "", 
-                "type": "string"
-            }, 
-            "value": {
-                "description": "", 
-                "type": "string"
-            }
-        }, 
-        "required": [
-            "attribute-name", 
-            "value"
-        ], 
-        "type": "object"
-    }, 
-    "self": {
-        "description": "", 
-        "name": "PNFNAME_FROM_SDNR", 
-        "version": "1.0.0"
-    }
+	"dataformatversion": "1.0.0",
+	"jsonschema": {
+		"$schema": "http://json-schema.org/draft-04/schema#",
+		"additionalproperties": true,
+		"description": "",
+		"properties": {
+			"attribute-name": {
+				"description": "",
+				"type": "string"
+			},
+			"value": {
+				"description": "",
+				"type": "string"
+			}
+		},
+		"required": [
+			"attribute-name",
+			"value"
+		],
+		"type": "object"
+	},
+	"self": {
+		"description": "",
+		"name": "PNFNAME_FROM_SDNR",
+		"version": "1.0.0"
+	}
 }
 
diff --git a/dpo/data-formats/policyToSonReq-dataformat.json b/dpo/data-formats/policyToSonReq-dataformat.json
index f787695..c677a35 100644
--- a/dpo/data-formats/policyToSonReq-dataformat.json
+++ b/dpo/data-formats/policyToSonReq-dataformat.json
@@ -1,23 +1,23 @@
 {
-    "dataformatversion": "1.0.0", 
-    "jsonschema": {
-        "$schema": "http://json-schema.org/draft-04/schema#", 
-        "additionalproperties": true, 
-        "description": "", 
-        "properties": {
-            "policyName": {
-                "description": "", 
-                "type": "string"
-            }
-        }, 
-        "required": [
-            "policyName"
-        ], 
-        "type": "object"
-    }, 
-    "self": {
-        "description": "", 
-        "name": "SON_TO_POLICY_REST_REQ", 
-        "version": "1.0.0"
-    }
+	"dataformatversion": "1.0.0",
+	"jsonschema": {
+		"$schema": "http://json-schema.org/draft-04/schema#",
+		"additionalproperties": true,
+		"description": "",
+		"properties": {
+			"policyName": {
+				"description": "",
+				"type": "string"
+			}
+		},
+		"required": [
+			"policyName"
+		],
+		"type": "object"
+	},
+	"self": {
+		"description": "",
+		"name": "SON_TO_POLICY_REST_REQ",
+		"version": "1.0.0"
+	}
 }
diff --git a/dpo/data-formats/policyToSonResp-dataformat.json b/dpo/data-formats/policyToSonResp-dataformat.json
index 526f145..d409824 100644
--- a/dpo/data-formats/policyToSonResp-dataformat.json
+++ b/dpo/data-formats/policyToSonResp-dataformat.json
@@ -1,64 +1,64 @@
 {
-    "dataformatversion": "1.0.0", 
-    "jsonschema": {
-        "$schema": "http://json-schema.org/draft-04/schema#", 
-        "additionalproperties": true, 
-        "description": "", 
-        "properties": {
-            "configBody": {
-                "description": "", 
-                "type": "string"
-            }, 
-            "configBodyType": {
-                "description": "", 
-                "type": "string"
-            }, 
-            "configName": {
-                "description": "", 
-                "type": "string"
-            }, 
-            "onapName": {
-                "description": "", 
-                "type": "string"
-            }, 
-            "policyClass": {
-                "description": "", 
-                "type": "string"
-            }, 
-            "policyConfigType": {
-                "description": "", 
-                "type": "string"
-            }, 
-            "policyName": {
-                "description": "", 
-                "type": "string"
-            }, 
-            "policyVersion": {
-                "description": "", 
-                "type": "string"
-            }, 
-            "ttlDate": {
-                "description": "", 
-                "type": "string"
-            }
-        }, 
-        "required": [
-            "configBody", 
-            "configBodyType", 
-            "configName", 
-            "onapName", 
-            "policyClass", 
-            "policyConfigType", 
-            "policyName", 
-            "policyVersion", 
-            "ttlDate"
-        ], 
-        "type": "object"
-    }, 
-    "self": {
-        "description": "", 
-        "name": "POLICY_TO_SON_REST_RESP", 
-        "version": "1.0.0"
-    }
+	"dataformatversion": "1.0.0",
+	"jsonschema": {
+		"$schema": "http://json-schema.org/draft-04/schema#",
+		"additionalproperties": true,
+		"description": "",
+		"properties": {
+			"configBody": {
+				"description": "",
+				"type": "string"
+			},
+			"configBodyType": {
+				"description": "",
+				"type": "string"
+			},
+			"configName": {
+				"description": "",
+				"type": "string"
+			},
+			"onapName": {
+				"description": "",
+				"type": "string"
+			},
+			"policyClass": {
+				"description": "",
+				"type": "string"
+			},
+			"policyConfigType": {
+				"description": "",
+				"type": "string"
+			},
+			"policyName": {
+				"description": "",
+				"type": "string"
+			},
+			"policyVersion": {
+				"description": "",
+				"type": "string"
+			},
+			"ttlDate": {
+				"description": "",
+				"type": "string"
+			}
+		},
+		"required": [
+			"configBody",
+			"configBodyType",
+			"configName",
+			"onapName",
+			"policyClass",
+			"policyConfigType",
+			"policyName",
+			"policyVersion",
+			"ttlDate"
+		],
+		"type": "object"
+	},
+	"self": {
+		"description": "",
+		"name": "POLICY_TO_SON_REST_RESP",
+		"version": "1.0.0"
+	}
 }
 
diff --git a/dpo/data-formats/sonInputFromSdnr-dataformat.json b/dpo/data-formats/sonInputFromSdnr-dataformat.json
index de8c017..0ff1bc7 100644
--- a/dpo/data-formats/sonInputFromSdnr-dataformat.json
+++ b/dpo/data-formats/sonInputFromSdnr-dataformat.json
@@ -1,212 +1,212 @@
 {
-    "dataformatversion": "1.0.0", 
-    "jsonschema": {
-        "$schema": "http://json-schema.org/draft-04/schema#", 
-        "additionalproperties": true, 
-        "description": "", 
-        "properties": {
-            "AAI": {
-                "description": "", 
-                "type": "object"
-            }, 
-            "Action": {
-                "description": "", 
-                "type": "string"
-            }, 
-            "Payload": {
-                "additionalproperties": true, 
-                "description": "", 
-                "properties": {
-                    "RadioAccess": {
-                        "additionalproperties": true, 
-                        "description": "", 
-                        "properties": {
-                            "FAPServiceList": {
-                                "description": "", 
-                                "items": {
-                                    "additionalproperties": true, 
-                                    "description": "", 
-                                    "properties": {
-                                        "CellConfig": {
-                                            "additionalproperties": true, 
-                                            "description": "", 
-                                            "properties": {
-                                                "LTE": {
-                                                    "additionalproperties": true, 
-                                                    "description": "", 
-                                                    "properties": {
-                                                        "RAN": {
-                                                            "additionalproperties": true, 
-                                                            "description": "", 
-                                                            "properties": {
-                                                                "CellIdentity": {
-                                                                    "description": "", 
-                                                                    "type": "string"
-                                                                }, 
-                                                                "NeighborListInUse": {
-                                                                    "additionalproperties": true, 
-                                                                    "description": "", 
-                                                                    "properties": {
-                                                                        "LTECellNumberOfEntries": {
-                                                                            "description": "", 
-                                                                            "type": "string"
-                                                                        }, 
-                                                                        "LTENeighborListInUseLTECell": {
-                                                                            "description": "", 
-                                                                            "items": {
-                                                                                "additionalproperties": true, 
-                                                                                "description": "", 
-                                                                                "properties": {
-                                                                                    "alias": {
-                                                                                        "description": "", 
-                                                                                        "type": "string"
-                                                                                    }, 
-                                                                                    "blacklisted": {
-                                                                                        "description": "", 
-                                                                                        "type": "string"
-                                                                                    }, 
-                                                                                    "cid": {
-                                                                                        "description": "", 
-                                                                                        "type": "string"
-                                                                                    }, 
-                                                                                    "enable": {
-                                                                                        "description": "", 
-                                                                                        "type": "string"
-                                                                                    }, 
-                                                                                    "mustInclude": {
-                                                                                        "description": "", 
-                                                                                        "type": "string"
-                                                                                    }, 
-                                                                                    "phyCellId": {
-                                                                                        "description": "", 
-                                                                                        "type": "string"
-                                                                                    }, 
-                                                                                    "plmnid": {
-                                                                                        "description": "", 
-                                                                                        "type": "string"
-                                                                                    }, 
-                                                                                    "pnfName": {
-                                                                                        "description": "", 
-                                                                                        "type": "string"
-                                                                                    }
-                                                                                }, 
-                                                                                "required": [
-                                                                                    "alias", 
-                                                                                    "blacklisted", 
-                                                                                    "cid", 
-                                                                                    "enable", 
-                                                                                    "mustInclude", 
-                                                                                    "phyCellId", 
-                                                                                    "plmnid", 
-                                                                                    "pnfName"
-                                                                                ], 
-                                                                                "type": "object"
-                                                                            }, 
-                                                                            "type": "array"
-                                                                        }
-                                                                    }, 
-                                                                    "required": [
-                                                                        "LTECellNumberOfEntries", 
-                                                                        "LTENeighborListInUseLTECell"
-                                                                    ], 
-                                                                    "type": "object"
-                                                                }
-                                                            }, 
-                                                            "required": [
-                                                                "CellIdentity", 
-                                                                "NeighborListInUse"
-                                                            ], 
-                                                            "type": "object"
-                                                        }
-                                                    }, 
-                                                    "required": [
-                                                        "RAN"
-                                                    ], 
-                                                    "type": "object"
-                                                }
-                                            }, 
-                                            "required": [
-                                                "LTE"
-                                            ], 
-                                            "type": "object"
-                                        }, 
-                                        "X0005b9Lte": {
-                                            "additionalproperties": true, 
-                                            "description": "", 
-                                            "properties": {
-                                                "phyCellIdInUse": {
-                                                    "description": "", 
-                                                    "type": "string"
-                                                }, 
-                                                "pnfName": {
-                                                    "description": "", 
-                                                    "type": "string"
-                                                }
-                                            }, 
-                                            "required": [
-                                                "phyCellIdInUse", 
-                                                "pnfName"
-                                            ], 
-                                            "type": "object"
-                                        }, 
-                                        "alias": {
-                                            "description": "", 
-                                            "type": "string"
-                                        }
-                                    }, 
-                                    "required": [
-                                        "CellConfig", 
-                                        "X0005b9Lte", 
-                                        "alias"
-                                    ], 
-                                    "type": "object"
-                                }, 
-                                "type": "array"
-                            }, 
-                            "FAPServiceNumberOfEntries": {
-                                "description": "", 
-                                "type": "string"
-                            }
-                        }, 
-                        "required": [
-                            "FAPServiceList", 
-                            "FAPServiceNumberOfEntries"
-                        ], 
-                        "type": "object"
-                    }
-                }, 
-                "required": [
-                    "RadioAccess"
-                ], 
-                "type": "object"
-            }, 
-            "from": {
-                "description": "", 
-                "type": "string"
-            }, 
-            "requestID": {
-                "description": "", 
-                "type": "string"
-            }, 
-            "version": {
-                "description": "", 
-                "type": "string"
-            }
-        }, 
-        "required": [
-            "AAI", 
-            "Action", 
-            "Payload", 
-            "from", 
-            "requestID", 
-            "version"
-        ], 
-        "type": "object"
-    }, 
-    "self": {
-        "description": "dmaap message from SDNR to SON handler", 
-        "name": "SON_INPUT_FROM_SDNR", 
-        "version": "1.0.0"
-    }
+	"dataformatversion": "1.0.0",
+	"jsonschema": {
+		"$schema": "http://json-schema.org/draft-04/schema#",
+		"additionalproperties": true,
+		"description": "",
+		"properties": {
+			"AAI": {
+				"description": "",
+				"type": "object"
+			},
+			"Action": {
+				"description": "",
+				"type": "string"
+			},
+			"Payload": {
+				"additionalproperties": true,
+				"description": "",
+				"properties": {
+					"RadioAccess": {
+						"additionalproperties": true,
+						"description": "",
+						"properties": {
+							"FAPServiceList": {
+								"description": "",
+								"items": {
+									"additionalproperties": true,
+									"description": "",
+									"properties": {
+										"CellConfig": {
+											"additionalproperties": true,
+											"description": "",
+											"properties": {
+												"LTE": {
+													"additionalproperties": true,
+													"description": "",
+													"properties": {
+														"RAN": {
+															"additionalproperties": true,
+															"description": "",
+															"properties": {
+																"CellIdentity": {
+																	"description": "",
+																	"type": "string"
+																},
+																"NeighborListInUse": {
+																	"additionalproperties": true,
+																	"description": "",
+																	"properties": {
+																		"LTECellNumberOfEntries": {
+																			"description": "",
+																			"type": "string"
+																		},
+																		"LTENeighborListInUseLTECell": {
+																			"description": "",
+																			"items": {
+																				"additionalproperties": true,
+																				"description": "",
+																				"properties": {
+																					"alias": {
+																						"description": "",
+																						"type": "string"
+																					},
+																					"blacklisted": {
+																						"description": "",
+																						"type": "string"
+																					},
+																					"cid": {
+																						"description": "",
+																						"type": "string"
+																					},
+																					"enable": {
+																						"description": "",
+																						"type": "string"
+																					},
+																					"mustInclude": {
+																						"description": "",
+																						"type": "string"
+																					},
+																					"phyCellId": {
+																						"description": "",
+																						"type": "string"
+																					},
+																					"plmnid": {
+																						"description": "",
+																						"type": "string"
+																					},
+																					"pnfName": {
+																						"description": "",
+																						"type": "string"
+																					}
+																				},
+																				"required": [
+																					"alias",
+																					"blacklisted",
+																					"cid",
+																					"enable",
+																					"mustInclude",
+																					"phyCellId",
+																					"plmnid",
+																					"pnfName"
+																				],
+																				"type": "object"
+																			},
+																			"type": "array"
+																		}
+																	},
+																	"required": [
+																		"LTECellNumberOfEntries",
+																		"LTENeighborListInUseLTECell"
+																	],
+																	"type": "object"
+																}
+															},
+															"required": [
+																"CellIdentity",
+																"NeighborListInUse"
+															],
+															"type": "object"
+														}
+													},
+													"required": [
+														"RAN"
+													],
+													"type": "object"
+												}
+											},
+											"required": [
+												"LTE"
+											],
+											"type": "object"
+										},
+										"X0005b9Lte": {
+											"additionalproperties": true,
+											"description": "",
+											"properties": {
+												"phyCellIdInUse": {
+													"description": "",
+													"type": "string"
+												},
+												"pnfName": {
+													"description": "",
+													"type": "string"
+												}
+											},
+											"required": [
+												"phyCellIdInUse",
+												"pnfName"
+											],
+											"type": "object"
+										},
+										"alias": {
+											"description": "",
+											"type": "string"
+										}
+									},
+									"required": [
+										"CellConfig",
+										"X0005b9Lte",
+										"alias"
+									],
+									"type": "object"
+								},
+								"type": "array"
+							},
+							"FAPServiceNumberOfEntries": {
+								"description": "",
+								"type": "string"
+							}
+						},
+						"required": [
+							"FAPServiceList",
+							"FAPServiceNumberOfEntries"
+						],
+						"type": "object"
+					}
+				},
+				"required": [
+					"RadioAccess"
+				],
+				"type": "object"
+			},
+			"from": {
+				"description": "",
+				"type": "string"
+			},
+			"requestID": {
+				"description": "",
+				"type": "string"
+			},
+			"version": {
+				"description": "",
+				"type": "string"
+			}
+		},
+		"required": [
+			"AAI",
+			"Action",
+			"Payload",
+			"from",
+			"requestID",
+			"version"
+		],
+		"type": "object"
+	},
+	"self": {
+		"description": "dmaap message from SDNR to SON handler",
+		"name": "SON_INPUT_FROM_SDNR",
+		"version": "1.0.0"
+	}
 }
 
diff --git a/dpo/data-formats/sonToOofReq-dataformat.json b/dpo/data-formats/sonToOofReq-dataformat.json
index 3ca70e0..e686dd1 100644
--- a/dpo/data-formats/sonToOofReq-dataformat.json
+++ b/dpo/data-formats/sonToOofReq-dataformat.json
@@ -1,97 +1,97 @@
 {
-    "dataformatversion": "1.0.0", 
-    "jsonschema": {
-        "$schema": "http://json-schema.org/draft-04/schema#", 
-        "additionalproperties": true, 
-        "description": "", 
-        "properties": {
-            "cellInfo": {
-                "additionalproperties": true, 
-                "description": "", 
-                "properties": {
-                    "cellIdList": {
-                        "description": "", 
-                        "items": {
-                            "description": "", 
-                            "type": "string"
-                        }, 
-                        "type": "array"
-                    }, 
-                    "networkId": {
-                        "description": "", 
-                        "type": "string"
-                    }
-                }, 
-                "required": [
-                    "cellIdList", 
-                    "networkId"
-                ], 
-                "type": "object"
-            }, 
-            "requestInfo": {
-                "additionalproperties": true, 
-                "description": "", 
-                "properties": {
-                    "callbackUrl": {
-                        "description": "", 
-                        "type": "string"
-                    }, 
-                    "numSolutions": {
-                        "description": "", 
-                        "type": "integer"
-                    }, 
-                    "optimizers": {
-                        "description": "", 
-                        "items": {
-                            "description": "", 
-                            "type": "string"
-                        }, 
-                        "type": "array"
-                    }, 
-                    "requestId": {
-                        "description": "", 
-                        "type": "string"
-                    }, 
-                    "requestType": {
-                        "description": "", 
-                        "type": "string"
-                    }, 
-                    "sourceId": {
-                        "description": "", 
-                        "type": "string"
-                    }, 
-                    "timeout": {
-                        "description": "", 
-                        "type": "integer"
-                    }, 
-                    "transactionId": {
-                        "description": "", 
-                        "type": "string"
-                    }
-                }, 
-                "required": [
-                    "callbackUrl", 
-                    "numSolutions", 
-                    "optimizers", 
-                    "requestId", 
-                    "requestType", 
-                    "sourceId", 
-                    "timeout", 
-                    "transactionId"
-                ], 
-                "type": "object"
-            }
-        }, 
-        "required": [
-            "cellInfo", 
-            "requestInfo"
-        ], 
-        "type": "object"
-    }, 
-    "self": {
-        "description": "", 
-        "name": "SON_TO_OOF_REST_REQ", 
-        "version": "1.0.0"
-    }
+	"dataformatversion": "1.0.0",
+	"jsonschema": {
+		"$schema": "http://json-schema.org/draft-04/schema#",
+		"additionalproperties": true,
+		"description": "",
+		"properties": {
+			"cellInfo": {
+				"additionalproperties": true,
+				"description": "",
+				"properties": {
+					"cellIdList": {
+						"description": "",
+						"items": {
+							"description": "",
+							"type": "string"
+						},
+						"type": "array"
+					},
+					"networkId": {
+						"description": "",
+						"type": "string"
+					}
+				},
+				"required": [
+					"cellIdList",
+					"networkId"
+				],
+				"type": "object"
+			},
+			"requestInfo": {
+				"additionalproperties": true,
+				"description": "",
+				"properties": {
+					"callbackUrl": {
+						"description": "",
+						"type": "string"
+					},
+					"numSolutions": {
+						"description": "",
+						"type": "integer"
+					},
+					"optimizers": {
+						"description": "",
+						"items": {
+							"description": "",
+							"type": "string"
+						},
+						"type": "array"
+					},
+					"requestId": {
+						"description": "",
+						"type": "string"
+					},
+					"requestType": {
+						"description": "",
+						"type": "string"
+					},
+					"sourceId": {
+						"description": "",
+						"type": "string"
+					},
+					"timeout": {
+						"description": "",
+						"type": "integer"
+					},
+					"transactionId": {
+						"description": "",
+						"type": "string"
+					}
+				},
+				"required": [
+					"callbackUrl",
+					"numSolutions",
+					"optimizers",
+					"requestId",
+					"requestType",
+					"sourceId",
+					"timeout",
+					"transactionId"
+				],
+				"type": "object"
+			}
+		},
+		"required": [
+			"cellInfo",
+			"requestInfo"
+		],
+		"type": "object"
+	},
+	"self": {
+		"description": "",
+		"name": "SON_TO_OOF_REST_REQ",
+		"version": "1.0.0"
+	}
 }
 
diff --git a/dpo/data-formats/sonToPolicyReq-dataformat.json b/dpo/data-formats/sonToPolicyReq-dataformat.json
index 7686242..df016aa 100644
--- a/dpo/data-formats/sonToPolicyReq-dataformat.json
+++ b/dpo/data-formats/sonToPolicyReq-dataformat.json
@@ -1,24 +1,24 @@
 {
-    "dataformatversion": "1.0.0", 
-    "jsonschema": {
-        "$schema": "http://json-schema.org/draft-04/schema#", 
-        "additionalproperties": true, 
-        "description": "", 
-        "properties": {
-            "policyName": {
-                "description": "", 
-                "type": "string"
-            }
-        }, 
-        "required": [
-            "policyName"
-        ], 
-        "type": "object"
-    }, 
-    "self": {
-        "description": "", 
-        "name": "SON_TO_POLICY_REST_REQ", 
-        "version": "1.0.0"
-    }
+	"dataformatversion": "1.0.0",
+	"jsonschema": {
+		"$schema": "http://json-schema.org/draft-04/schema#",
+		"additionalproperties": true,
+		"description": "",
+		"properties": {
+			"policyName": {
+				"description": "",
+				"type": "string"
+			}
+		},
+		"required": [
+			"policyName"
+		],
+		"type": "object"
+	},
+	"self": {
+		"description": "",
+		"name": "SON_TO_POLICY_REST_REQ",
+		"version": "1.0.0"
+	}
 }