Merge "NONRTRIC PMS added support for custom A1 adapters"
diff --git a/a1-policy-management/src/main/resources/application_configuration_schema.json b/a1-policy-management/src/main/resources/application_configuration_schema.json
index 05135e7..947db33 100644
--- a/a1-policy-management/src/main/resources/application_configuration_schema.json
+++ b/a1-policy-management/src/main/resources/application_configuration_schema.json
@@ -54,6 +54,9 @@
},
"controller": {
"type": "string"
+ },
+ "customAdapterClass" : {
+ "type": "string"
},
"managedElementIds": {
"type": "array",
@@ -94,18 +97,21 @@
},
"required": [
"topic_url"
- ]
+ ],
+ "additionalProperties": false
}
},
"required": [
"type",
"dmaap_info"
- ]
+ ],
+ "additionalProperties": false
}
},
"required": [
"dmaap_publisher"
- ]
+ ],
+ "additionalProperties": false
},
"streams_subscribes": {
"type": "object",
@@ -125,18 +131,21 @@
},
"required": [
"topic_url"
- ]
+ ],
+ "additionalProperties": false
}
},
"required": [
"type",
"dmaap_info"
- ]
+ ],
+ "additionalProperties": false
}
},
"required": [
"dmaap_subscriber"
- ]
+ ],
+ "additionalProperties": false
}
},
"required": [
@@ -148,4 +157,4 @@
"required": [
"config"
]
-}
\ No newline at end of file
+}
diff --git a/a1-policy-management/src/test/resources/test_application_configuration_with_dmaap_config.json b/a1-policy-management/src/test/resources/test_application_configuration_with_dmaap_config.json
index 260dad2..6e1de75 100644
--- a/a1-policy-management/src/test/resources/test_application_configuration_with_dmaap_config.json
+++ b/a1-policy-management/src/test/resources/test_application_configuration_with_dmaap_config.json
@@ -14,6 +14,7 @@
"name": "ric1",
"controller": "controller1",
"baseUrl": "http://localhost:8083/",
+ "customAdapterClass": "org.onap.ccsdk.oran.a1policymanagementservice.clients.StdA1ClientVersion2$Factory",
"managedElementIds": [
"kista_1",
"kista_2"
@@ -22,7 +23,6 @@
{
"name": "ric2",
"baseUrl": "http://localhost:8085/",
- "customAdapterClass": "org.onap.ccsdk.oran.a1policymanagementservice.clients.StdA1ClientVersion2$Factory",
"managedElementIds": [
"kista_3",
"kista_4"