Merge "Cleanup eclipse warnings"

diff --git a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.Common.yaml b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.Common.yaml
index 4f3723b..c442e4a 100644 (file)
--- a/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.Common.yaml
+++ b/models-examples/src/main/resources/policytypes/onap.policies.controlloop.operational.Common.yaml
@@ -50,6 +50,8 @@ data_types:
                     Map of values that identify the resource. If none are provided, it is assumed that the
                     entity that generated the ONSET event will be the target.
                 required: false
+                metadata:
+                    clamp_possible_values: ClampExecution:CSAR_RESOURCES
                 entry_schema:
                     type: string
 
@@ -61,20 +63,24 @@ data_types:
                 type: string
                 description: The actor performing the operation.
                 required: true
+                metadata:
+                    clamp_possible_values: Dictionary:DefaultActors,ClampExecution:CDS/actor
             operation:
                 type: string
                 description: The operation the actor is performing.
+                metadata:
+                    clamp_possible_values: Dictionary:DefaultOperations, ClampExecution:CDS/operations
                 required: true
             target:
                 type: onap.datatype.controlloop.Target
                 description: The resource the operation should be performed on.
                 required: true
-                metadata:
-                    clamp_possible_values: <string:see clamp project for syntax>
             payload:
                 type: map
                 description: Name/value pairs of payload information passed by Policy to the actor
                 required: false
+                metadata:
+                    clamp_possible_values: ClampExecution:CDS/payload
                 entry_schema:
                     type: string
 
@@ -94,8 +100,6 @@ data_types:
                 type: onap.datatype.controlloop.Actor
                 description: The definition of the operation to be performed.
                 required: true
-                metadata:
-                    clamp_possible_values: <string:see clamp project for syntax>
             timeout:
                 type: integer
                 description: The amount of time for the actor to perform the operation.

diff --git a/models-interactions/model-impl/cds/pom.xml b/models-interactions/model-impl/cds/pom.xml
index 59eca6c..718ae6c 100644 (file)
--- a/models-interactions/model-impl/cds/pom.xml
+++ b/models-interactions/model-impl/cds/pom.xml
@@ -35,7 +35,7 @@
   <properties>
     <grpc.version>1.17.1</grpc.version>
     <protobuf.version>3.6.1</protobuf.version>
-    <grpc.netty.version>4.1.39.Final</grpc.netty.version>
+    <grpc.netty.version>4.1.48.Final</grpc.netty.version>
   </properties>
 
   <dependencies>