diff options
| author |   sebdet <sebastien.determe@intl.att.com> | 2020-03-24 08:51:20 -0700 |
|---|---|---|
| committer | sebdet <sebastien.determe@intl.att.com> | 2020-03-24 08:51:20 -0700 |
| commit | e65d457a2dfd6ebb5e1f5a28b74f05c16c285dc3 (patch) | |
| tree | c1b72bb7924c826484b89d931f6a4a298082e64a /src/test/resources | |
| parent | afac3121bfacc4d81903b1d8492613b0b77d3298 (diff) | |
Improve metadata support
Improve the metadata support for CDS and default values
Issue-ID: CLAMP-786
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: I8a24e31a93ff1e288ec8f0f6d522b1b15d39a8d2
Diffstat (limited to 'src/test/resources')
3 files changed, 43 insertions, 10 deletions
diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0?connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0?connectionTimeToLive=5000/.file index ae0dfbfc3..49f409ae3 100644 --- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0?connectionTimeToLive=5000/.file +++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Apex/versions/1.0.0?connectionTimeToLive=5000/.file @@ -85,13 +85,13 @@ data_types: description: The actor performing the operation. required: true metadata: - clamp_possible_values: Dictionary:DefaultActor + clamp_possible_values: Dictionary:DefaultActors,ClampExecution:CDS/actor operation: type: string description: The operation the actor is performing. required: true metadata: - clamp_possible_values: ClampExecution:CDS/operation + clamp_possible_values: Dictionary:DefaultOperations,ClampExecution:CDS/operation target: type: onap.datatype.controlloop.Target description: The resource the operation should be performed on. diff --git a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0?connectionTimeToLive=5000/.file b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0?connectionTimeToLive=5000/.file index 1f8723c3d..af7a61ef7 100644 --- a/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0?connectionTimeToLive=5000/.file +++ b/src/test/resources/http-cache/example/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0?connectionTimeToLive=5000/.file @@ -73,13 +73,13 @@ data_types: description: The actor performing the operation. required: true metadata: - clamp_possible_values: Dictionary:DefaultActor + clamp_possible_values: Dictionary:DefaultActors,ClampExecution:CDS/actor operation: type: string description: The operation the actor is performing. required: true metadata: - clamp_possible_values: ClampExecution:CDS/operation + clamp_possible_values: Dictionary:DefaultOperations, ClampExecution:CDS/operations target: type: onap.datatype.controlloop.Target description: The resource the operation should be performed on. diff --git a/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json b/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json index a44b94e07..3fda11116 100644 --- a/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json +++ b/src/test/resources/tosca/new-converter/tosca_apex_with_metadata.json @@ -66,15 +66,20 @@ "type": "string", "description": "The actor performing the operation.", "enum": [ - "CDS", + "SDNR", "SDNC", - "SO" + "VFC", + "SO", + "APPC", + "CDS" ], "options": { "enum_titles": [ - "CDS", + "SDNR", "SDNC", - "SO" + "VFC", + "SO", + "APPC" ] } }, @@ -82,13 +87,41 @@ "type": "string", "description": "The operation the actor is performing.", "enum": [ + "BandwidthOnDemand", + "VF Module Delete", + "Reroute", + "VF Module Create", + "ModifyConfig", + "Rebuild", + "Restart", + "Migrate", + "Health-Check", "resource-assignment", "activate", "activate-restconf", "activate-cli", "assign-activate", "imperative-test-wf" - ] + ], + "options": { + "enum_titles": [ + "BandwidthOnDemand (SDNC operation)", + "VF Module Delete (SO operation)", + "Reroute (SDNC operation)", + "VF Module Create (SO operation)", + "ModifyConfig (APPC/VFC operation)", + "Rebuild (APPC operation)", + "Restart (APPC operation)", + "Migrate (APPC operation)", + "Health-Check (APPC operation)", + "resource-assignment (CDS operation)", + "activate (CDS operation)", + "activate-restconf (CDS operation)", + "activate-cli (CDS operation)", + "assign-activate (CDS operation)", + "imperative-test-wf (CDS operation)" + ] + } }, "target": { "title": "onap.datatype.controlloop.Target", @@ -294,7 +327,7 @@ "payload": { "type": "object", "description": "Name/value pairs of payload information passed by Policy to the actor", - "anyOf": [ + "enum": [ { "title": "resource-assignment", "properties": { |