diff options
| author |   Dan Timoney <dtimoney@att.com> | 2022-05-25 18:53:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2022-05-25 18:53:40 +0000 |
| commit | feed7a7eb0405135c014713887536595651ab83a (patch) | |
| tree | c918942498e2c27c9a3d65d05e83a1145fff3998 | |
| parent | 8ce28f300f6f058574573dfbd2bdf9473bd163eb (diff) | |
| parent | a14fe6a166fabde251570f80f8a4019ba3d9f5fe (diff) | |
Merge "NONRTRIC PMS added support for custom A1 adapters"
| -rw-r--r-- | a1-policy-management/src/main/resources/application_configuration_schema.json | 23 | ||||
| -rw-r--r-- | a1-policy-management/src/test/resources/test_application_configuration_with_dmaap_config.json | 2 |
2 files changed, 17 insertions, 8 deletions
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 05135e7c..947db33e 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 260dad2d..6e1de75e 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" |