Speed up tests on policy-api
[policy/api.git] / main / src / main / java / org / onap / policy / api / main / rest / ApiRestController.java
index 9ec97bd..6d6b4d1 100644 (file)
@@ -36,7 +36,11 @@ import io.swagger.annotations.Info;
 import io.swagger.annotations.ResponseHeader;\r
 import io.swagger.annotations.SecurityDefinition;\r
 import io.swagger.annotations.SwaggerDefinition;\r
+\r
+import java.util.List;\r
+import java.util.Map;\r
 import java.util.UUID;\r
+\r
 import javax.ws.rs.Consumes;\r
 import javax.ws.rs.DELETE;\r
 import javax.ws.rs.GET;\r
@@ -45,43 +49,49 @@ import javax.ws.rs.POST;
 import javax.ws.rs.Path;\r
 import javax.ws.rs.PathParam;\r
 import javax.ws.rs.Produces;\r
-import javax.ws.rs.QueryParam;\r
-import javax.ws.rs.core.MediaType;\r
 import javax.ws.rs.core.Response;\r
-import javax.ws.rs.core.Response.ResponseBuilder;\r
+\r
+import org.apache.commons.lang3.tuple.Pair;\r
 import org.onap.policy.api.main.rest.provider.HealthCheckProvider;\r
 import org.onap.policy.api.main.rest.provider.PolicyProvider;\r
 import org.onap.policy.api.main.rest.provider.PolicyTypeProvider;\r
 import org.onap.policy.api.main.rest.provider.StatisticsProvider;\r
+import org.onap.policy.common.endpoints.event.comm.Topic.CommInfrastructure;\r
 import org.onap.policy.common.endpoints.report.HealthCheckReport;\r
-import org.onap.policy.models.tosca.concepts.ToscaServiceTemplate;\r
+import org.onap.policy.common.endpoints.utils.NetLoggerUtil;\r
+import org.onap.policy.common.endpoints.utils.NetLoggerUtil.EventType;\r
+import org.onap.policy.models.base.PfModelException;\r
+import org.onap.policy.models.base.PfModelRuntimeException;\r
+import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;\r
+import org.onap.policy.models.tosca.authorative.concepts.ToscaServiceTemplate;\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
 \r
 /**\r
  * Class to provide REST API services.\r
+ *\r
+ * @author Chenfei Gao (cgao@research.att.com)\r
  */\r
 @Path("/policy/api/v1")\r
 @Api(value = "Policy Design API")\r
-@Produces(MediaType.APPLICATION_JSON)\r
-@Consumes(MediaType.APPLICATION_JSON)\r
+@Produces({"application/json", "application/yaml"})\r
+@Consumes({"application/json", "application/yaml"})\r
 @SwaggerDefinition(info = @Info(\r
         description = "Policy Design API is publicly exposed for clients to Create/Read/Update/Delete"\r
-                    + " policy types, policy type implementation and policies which can be recognized"\r
-                    + " and executable by incorporated policy engines. It is an"\r
-                    + " independent component running rest service that takes all policy design API calls"\r
-                    + " from clients and then assign them to different API working functions. Besides"\r
-                    + " that, API is also exposed for clients to retrieve healthcheck status of this API"\r
-                    + " rest service and the statistics report including the counters of API invocation.",\r
-        version = "1.0.0",\r
-        title = "Policy Design",\r
-        extensions = {\r
-                @Extension(properties = {\r
-                        @ExtensionProperty(name = "planned-retirement-date", value = "tbd"),\r
-                        @ExtensionProperty(name = "component", value = "Policy Framework")\r
-                })\r
-        }),\r
-        schemes = { SwaggerDefinition.Scheme.HTTP, SwaggerDefinition.Scheme.HTTPS },\r
-        securityDefinition = @SecurityDefinition(basicAuthDefinitions = { @BasicAuthDefinition(key = "basicAuth") }))\r
-public class ApiRestController {\r
+                + " policy types, policy type implementation and policies which can be recognized"\r
+                + " and executable by incorporated policy engines. It is an"\r
+                + " independent component running rest service that takes all policy design API calls"\r
+                + " from clients and then assign them to different API working functions. Besides"\r
+                + " that, API is also exposed for clients to retrieve healthcheck status of this API"\r
+                + " rest service and the statistics report including the counters of API invocation.",\r
+        version = "1.0.0", title = "Policy Design",\r
+        extensions = {@Extension(properties = {@ExtensionProperty(name = "planned-retirement-date", value = "tbd"),\r
+            @ExtensionProperty(name = "component", value = "Policy Framework")})}),\r
+        schemes = {SwaggerDefinition.Scheme.HTTP, SwaggerDefinition.Scheme.HTTPS},\r
+        securityDefinition = @SecurityDefinition(basicAuthDefinitions = {@BasicAuthDefinition(key = "basicAuth")}))\r
+public class ApiRestController extends CommonRestController {\r
+\r
+    private static final Logger LOGGER = LoggerFactory.getLogger(ApiRestController.class);\r
 \r
     /**\r
      * Retrieves the healthcheck status of the API component.\r
@@ -90,43 +100,34 @@ public class ApiRestController {
      */\r
     @GET\r
     @Path("/healthcheck")\r
-    @ApiOperation(value = "Perform a system healthcheck",\r
-            notes = "Returns healthy status of the Policy API component",\r
+    @ApiOperation(value = "Perform a system healthcheck", notes = "Returns healthy status of the Policy API component",\r
             response = HealthCheckReport.class,\r
             responseHeaders = {\r
-                    @ResponseHeader(name = "X-MinorVersion",\r
-                                    description = "Used to request or communicate a MINOR version back from the client"\r
-                                                + " to the server, and from the server back to the client",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-PatchVersion",\r
-                                    description = "Used only to communicate a PATCH version in a response for"\r
-                                                + " troubleshooting purposes only, and will not be provided by"\r
-                                                + " the client on request",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-LatestVersion",\r
-                                    description = "Used only to communicate an API's latest version",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-ONAP-RequestID",\r
-                                    description = "Used to track REST transactions for logging purpose",\r
-                                    response = UUID.class)\r
-            },\r
-            authorizations = @Authorization(value = "basicAuth"),\r
-            tags = { "HealthCheck", },\r
-            extensions = {\r
-                    @Extension(name = "interface info", properties = {\r
-                            @ExtensionProperty(name = "api-version", value = "1.0.0"),\r
-                            @ExtensionProperty(name = "last-mod-release", value = "Dublin")\r
-                    })\r
-            })\r
-    @ApiResponses(value = {\r
-            @ApiResponse(code = 401, message = "Authentication Error"),\r
-            @ApiResponse(code = 403, message = "Authorization Error"),\r
-            @ApiResponse(code = 500, message = "Internal Server Error")\r
-        })\r
+                @ResponseHeader(name = "X-MinorVersion",\r
+                        description = "Used to request or communicate a MINOR version back from the client"\r
+                                + " to the server, and from the server back to the client",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-PatchVersion",\r
+                        description = "Used only to communicate a PATCH version in a response for"\r
+                                + " troubleshooting purposes only, and will not be provided by"\r
+                                + " the client on request",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-LatestVersion",\r
+                        description = "Used only to communicate an API's latest version", response = String.class),\r
+                @ResponseHeader(name = "X-ONAP-RequestID",\r
+                        description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
+            authorizations = @Authorization(value = "basicAuth"), tags = {"HealthCheck",},\r
+            extensions = {@Extension(name = "interface info",\r
+                    properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
+                        @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
+    @ApiResponses(value = {@ApiResponse(code = 401, message = "Authentication Error"),\r
+        @ApiResponse(code = 403, message = "Authorization Error"),\r
+        @ApiResponse(code = 500, message = "Internal Server Error")})\r
     public Response getHealthCheck(\r
             @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) {\r
-        return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-            .entity(new HealthCheckProvider().performHealthCheck()).build();\r
+\r
+        updateApiStatisticsCounter(Target.OTHER, Result.SUCCESS, HttpMethod.GET);\r
+        return makeOkResponse(requestId, new HealthCheckProvider().performHealthCheck());\r
     }\r
 \r
     /**\r
@@ -140,39 +141,32 @@ public class ApiRestController {
             notes = "Returns current statistics including the counters of API invocation",\r
             response = StatisticsReport.class,\r
             responseHeaders = {\r
-                    @ResponseHeader(name = "X-MinorVersion",\r
-                                    description = "Used to request or communicate a MINOR version back from the client"\r
-                                                + " to the server, and from the server back to the client",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-PatchVersion",\r
-                                    description = "Used only to communicate a PATCH version in a response for"\r
-                                                + " troubleshooting purposes only, and will not be provided by"\r
-                                                + " the client on request",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-LatestVersion",\r
-                                    description = "Used only to communicate an API's latest version",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-ONAP-RequestID",\r
-                                    description = "Used to track REST transactions for logging purpose",\r
-                                    response = UUID.class)\r
-            },\r
-            authorizations = @Authorization(value = "basicAuth"),\r
-            tags = { "Statistics", },\r
-            extensions = {\r
-                    @Extension(name = "interface info", properties = {\r
-                            @ExtensionProperty(name = "api-version", value = "1.0.0"),\r
-                            @ExtensionProperty(name = "last-mod-release", value = "Dublin")\r
-                    })\r
-            })\r
-    @ApiResponses(value = {\r
-            @ApiResponse(code = 401, message = "Authentication Error"),\r
-            @ApiResponse(code = 403, message = "Authorization Error"),\r
-            @ApiResponse(code = 500, message = "Internal Server Error")\r
-        })\r
-    public Response getStatistics(\r
-            @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) {\r
-        return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-            .entity(new StatisticsProvider().fetchCurrentStatistics()).build();\r
+                @ResponseHeader(name = "X-MinorVersion",\r
+                        description = "Used to request or communicate a MINOR version back from the client"\r
+                                + " to the server, and from the server back to the client",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-PatchVersion",\r
+                        description = "Used only to communicate a PATCH version in a response for"\r
+                                + " troubleshooting purposes only, and will not be provided by"\r
+                                + " the client on request",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-LatestVersion",\r
+                        description = "Used only to communicate an API's latest version", response = String.class),\r
+                @ResponseHeader(name = "X-ONAP-RequestID",\r
+                        description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
+            authorizations = @Authorization(value = "basicAuth"), tags = {"Statistics",},\r
+            extensions = {@Extension(name = "interface info",\r
+                    properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
+                        @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
+    @ApiResponses(value = {@ApiResponse(code = 401, message = "Authentication Error"),\r
+        @ApiResponse(code = 403, message = "Authorization Error"),\r
+        @ApiResponse(code = 500, message = "Internal Server Error")})\r
+    public Response\r
+            getStatistics(@HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) {\r
+\r
+        updateApiStatisticsCounter(Target.OTHER, Result.SUCCESS, HttpMethod.GET);\r
+\r
+        return makeOkResponse(requestId, new StatisticsProvider().fetchCurrentStatistics());\r
     }\r
 \r
     /**\r
@@ -186,39 +180,38 @@ public class ApiRestController {
             notes = "Returns a list of existing policy types stored in Policy Framework",\r
             response = ToscaServiceTemplate.class,\r
             responseHeaders = {\r
-                    @ResponseHeader(name = "X-MinorVersion",\r
-                                    description = "Used to request or communicate a MINOR version back from the client"\r
-                                                + " to the server, and from the server back to the client",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-PatchVersion",\r
-                                    description = "Used only to communicate a PATCH version in a response for"\r
-                                                + " troubleshooting purposes only, and will not be provided by"\r
-                                                + " the client on request",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-LatestVersion",\r
-                                    description = "Used only to communicate an API's latest version",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-ONAP-RequestID",\r
-                                    description = "Used to track REST transactions for logging purpose",\r
-                                    response = UUID.class)\r
-            },\r
-            authorizations = @Authorization(value = "basicAuth"),\r
-            tags = { "PolicyType", },\r
-            extensions = {\r
-                    @Extension(name = "interface info", properties = {\r
-                            @ExtensionProperty(name = "api-version", value = "1.0.0"),\r
-                            @ExtensionProperty(name = "last-mod-release", value = "Dublin")\r
-                    })\r
-            })\r
-    @ApiResponses(value = {\r
-            @ApiResponse(code = 401, message = "Authentication Error"),\r
-            @ApiResponse(code = 403, message = "Authorization Error"),\r
-            @ApiResponse(code = 500, message = "Internal Server Error")\r
-        })\r
+                @ResponseHeader(name = "X-MinorVersion",\r
+                        description = "Used to request or communicate a MINOR version back from the client"\r
+                                + " to the server, and from the server back to the client",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-PatchVersion",\r
+                        description = "Used only to communicate a PATCH version in a response for"\r
+                                + " troubleshooting purposes only, and will not be provided by"\r
+                                + " the client on request",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-LatestVersion",\r
+                        description = "Used only to communicate an API's latest version", response = String.class),\r
+                @ResponseHeader(name = "X-ONAP-RequestID",\r
+                        description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
+            authorizations = @Authorization(value = "basicAuth"), tags = {"PolicyType",},\r
+            extensions = {@Extension(name = "interface info",\r
+                    properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
+                        @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
+    @ApiResponses(value = {@ApiResponse(code = 401, message = "Authentication Error"),\r
+        @ApiResponse(code = 403, message = "Authorization Error"),\r
+        @ApiResponse(code = 500, message = "Internal Server Error")})\r
     public Response getAllPolicyTypes(\r
             @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) {\r
-        return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-            .entity(new PolicyTypeProvider().fetchPolicyTypes(null, null)).build();\r
+\r
+        try (PolicyTypeProvider policyTypeProvider = new PolicyTypeProvider()) {\r
+            ToscaServiceTemplate serviceTemplate = policyTypeProvider.fetchPolicyTypes(null, null);\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, Result.SUCCESS, HttpMethod.GET);\r
+            return makeOkResponse(requestId, serviceTemplate);\r
+        } catch (PfModelException | PfModelRuntimeException pfme) {\r
+            LOGGER.debug("GET /policytypes", pfme);\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, Result.FAILURE, HttpMethod.GET);\r
+            return makeErrorResponse(requestId, pfme);\r
+        }\r
     }\r
 \r
     /**\r
@@ -234,41 +227,40 @@ public class ApiRestController {
             notes = "Returns a list of all available versions for the specified policy type",\r
             response = ToscaServiceTemplate.class,\r
             responseHeaders = {\r
-                    @ResponseHeader(name = "X-MinorVersion",\r
-                                    description = "Used to request or communicate a MINOR version back from the client"\r
-                                                + " to the server, and from the server back to the client",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-PatchVersion",\r
-                                    description = "Used only to communicate a PATCH version in a response for"\r
-                                                + " troubleshooting purposes only, and will not be provided by"\r
-                                                + " the client on request",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-LatestVersion",\r
-                                    description = "Used only to communicate an API's latest version",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-ONAP-RequestID",\r
-                                    description = "Used to track REST transactions for logging purpose",\r
-                                    response = UUID.class)\r
-            },\r
-            authorizations = @Authorization(value = "basicAuth"),\r
-            tags = { "PolicyType", },\r
-            extensions = {\r
-                    @Extension(name = "interface info", properties = {\r
-                            @ExtensionProperty(name = "api-version", value = "1.0.0"),\r
-                            @ExtensionProperty(name = "last-mod-release", value = "Dublin")\r
-                    })\r
-            })\r
-    @ApiResponses(value = {\r
-            @ApiResponse(code = 401, message = "Authentication Error"),\r
-            @ApiResponse(code = 403, message = "Authorization Error"),\r
-            @ApiResponse(code = 404, message = "Resource Not Found"),\r
-            @ApiResponse(code = 500, message = "Internal Server Error")\r
-        })\r
+                @ResponseHeader(name = "X-MinorVersion",\r
+                        description = "Used to request or communicate a MINOR version back from the client"\r
+                                + " to the server, and from the server back to the client",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-PatchVersion",\r
+                        description = "Used only to communicate a PATCH version in a response for"\r
+                                + " troubleshooting purposes only, and will not be provided by"\r
+                                + " the client on request",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-LatestVersion",\r
+                        description = "Used only to communicate an API's latest version", response = String.class),\r
+                @ResponseHeader(name = "X-ONAP-RequestID",\r
+                        description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
+            authorizations = @Authorization(value = "basicAuth"), tags = {"PolicyType",},\r
+            extensions = {@Extension(name = "interface info",\r
+                    properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
+                        @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
+    @ApiResponses(value = {@ApiResponse(code = 401, message = "Authentication Error"),\r
+        @ApiResponse(code = 403, message = "Authorization Error"),\r
+        @ApiResponse(code = 404, message = "Resource Not Found"),\r
+        @ApiResponse(code = 500, message = "Internal Server Error")})\r
     public Response getAllVersionsOfPolicyType(\r
             @PathParam("policyTypeId") @ApiParam(value = "ID of policy type", required = true) String policyTypeId,\r
             @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) {\r
-        return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-            .entity(new PolicyTypeProvider().fetchPolicyTypes(policyTypeId, null)).build();\r
+\r
+        try (PolicyTypeProvider policyTypeProvider = new PolicyTypeProvider()) {\r
+            ToscaServiceTemplate serviceTemplate = policyTypeProvider.fetchPolicyTypes(policyTypeId, null);\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, Result.SUCCESS, HttpMethod.GET);\r
+            return makeOkResponse(requestId, serviceTemplate);\r
+        } catch (PfModelException | PfModelRuntimeException pfme) {\r
+            LOGGER.debug("GET /policytypes/{}", policyTypeId, pfme);\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, Result.FAILURE, HttpMethod.GET);\r
+            return makeErrorResponse(requestId, pfme);\r
+        }\r
     }\r
 \r
     /**\r
@@ -282,148 +274,143 @@ public class ApiRestController {
     @GET\r
     @Path("/policytypes/{policyTypeId}/versions/{versionId}")\r
     @ApiOperation(value = "Retrieve one particular version of a policy type",\r
-            notes = "Returns a particular version for the specified policy type",\r
-            response = ToscaServiceTemplate.class,\r
+            notes = "Returns a particular version for the specified policy type", response = ToscaServiceTemplate.class,\r
             responseHeaders = {\r
-                    @ResponseHeader(name = "X-MinorVersion",\r
-                                    description = "Used to request or communicate a MINOR version back from the client"\r
-                                                + " to the server, and from the server back to the client",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-PatchVersion",\r
-                                    description = "Used only to communicate a PATCH version in a response for"\r
-                                                + " troubleshooting purposes only, and will not be provided by"\r
-                                                + " the client on request",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-LatestVersion",\r
-                                    description = "Used only to communicate an API's latest version",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-ONAP-RequestID",\r
-                                    description = "Used to track REST transactions for logging purpose",\r
-                                    response = UUID.class)\r
-            },\r
-            authorizations = @Authorization(value = "basicAuth"),\r
-            tags = { "PolicyType", },\r
-            extensions = {\r
-                    @Extension(name = "interface info", properties = {\r
-                            @ExtensionProperty(name = "api-version", value = "1.0.0"),\r
-                            @ExtensionProperty(name = "last-mod-release", value = "Dublin")\r
-                    })\r
-            })\r
-    @ApiResponses(value = {\r
-            @ApiResponse(code = 401, message = "Authentication Error"),\r
-            @ApiResponse(code = 403, message = "Authorization Error"),\r
-            @ApiResponse(code = 404, message = "Resource Not Found"),\r
-            @ApiResponse(code = 500, message = "Internal Server Error")\r
-        })\r
+                @ResponseHeader(name = "X-MinorVersion",\r
+                        description = "Used to request or communicate a MINOR version back from the client"\r
+                                + " to the server, and from the server back to the client",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-PatchVersion",\r
+                        description = "Used only to communicate a PATCH version in a response for"\r
+                                + " troubleshooting purposes only, and will not be provided by"\r
+                                + " the client on request",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-LatestVersion",\r
+                        description = "Used only to communicate an API's latest version", response = String.class),\r
+                @ResponseHeader(name = "X-ONAP-RequestID",\r
+                        description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
+            authorizations = @Authorization(value = "basicAuth"), tags = {"PolicyType",},\r
+            extensions = {@Extension(name = "interface info",\r
+                    properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
+                        @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
+    @ApiResponses(value = {@ApiResponse(code = 401, message = "Authentication Error"),\r
+        @ApiResponse(code = 403, message = "Authorization Error"),\r
+        @ApiResponse(code = 404, message = "Resource Not Found"),\r
+        @ApiResponse(code = 500, message = "Internal Server Error")})\r
     public Response getSpecificVersionOfPolicyType(\r
             @PathParam("policyTypeId") @ApiParam(value = "ID of policy type", required = true) String policyTypeId,\r
             @PathParam("versionId") @ApiParam(value = "Version of policy type", required = true) String versionId,\r
             @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) {\r
-        return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-            .entity(new PolicyTypeProvider().fetchPolicyTypes(policyTypeId, versionId)).build();\r
+\r
+        try (PolicyTypeProvider policyTypeProvider = new PolicyTypeProvider()) {\r
+            ToscaServiceTemplate serviceTemplate = policyTypeProvider.fetchPolicyTypes(policyTypeId, versionId);\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, Result.SUCCESS, HttpMethod.GET);\r
+            return makeOkResponse(requestId, serviceTemplate);\r
+        } catch (PfModelException | PfModelRuntimeException pfme) {\r
+            LOGGER.debug("GET /policytypes/{}/versions/{}", policyTypeId, versionId, pfme);\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, Result.FAILURE, HttpMethod.GET);\r
+            return makeErrorResponse(requestId, pfme);\r
+        }\r
     }\r
 \r
     /**\r
-     * Creates a new policy type.\r
+     * Retrieves latest version of a particular policy type.\r
      *\r
-     * @param body the body of policy type following TOSCA definition\r
+     * @param policyTypeId the ID of specified policy type\r
      *\r
      * @return the Response object containing the results of the API operation\r
      */\r
-    @POST\r
-    @Path("/policytypes")\r
-    @ApiOperation(value = "Create a new policy type",\r
-            notes = "Client should provide TOSCA body of the new policy type",\r
-            authorizations = @Authorization(value = "basicAuth"),\r
-            tags = { "PolicyType", },\r
-            extensions = {\r
-                    @Extension(name = "interface info", properties = {\r
-                            @ExtensionProperty(name = "api-version", value = "1.0.0"),\r
-                            @ExtensionProperty(name = "last-mod-release", value = "Dublin")\r
-                    })\r
-            })\r
-    @ApiResponses(value = {\r
-            @ApiResponse(code = 201, message = "Resource successfully created",\r
+    @GET\r
+    @Path("/policytypes/{policyTypeId}/versions/latest")\r
+    @ApiOperation(value = "Retrieve latest version of a policy type",\r
+            notes = "Returns latest version for the specified policy type", response = ToscaServiceTemplate.class,\r
             responseHeaders = {\r
-                    @ResponseHeader(name = "X-MinorVersion",\r
-                                    description = "Used to request or communicate a MINOR version back from the client"\r
-                                                + " to the server, and from the server back to the client",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-PatchVersion",\r
-                                    description = "Used only to communicate a PATCH version in a response for"\r
-                                                + " troubleshooting purposes only, and will not be provided by"\r
-                                                + " the client on request",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-LatestVersion",\r
-                                    description = "Used only to communicate an API's latest version",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-ONAP-RequestID",\r
-                                    description = "Used to track REST transactions for logging purpose",\r
-                                    response = UUID.class)\r
-            }),\r
-            @ApiResponse(code = 400, message = "Invalid Body"),\r
-            @ApiResponse(code = 401, message = "Authentication Error"),\r
-            @ApiResponse(code = 403, message = "Authorization Error"),\r
-            @ApiResponse(code = 500, message = "Internal Server Error")\r
-        })\r
-    public Response createPolicyType(\r
-            @ApiParam(value = "Entity body of policy type", required = true) ToscaServiceTemplate body,\r
+                @ResponseHeader(name = "X-MinorVersion",\r
+                        description = "Used to request or communicate a MINOR version back from the client"\r
+                                + " to the server, and from the server back to the client",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-PatchVersion",\r
+                        description = "Used only to communicate a PATCH version in a response for"\r
+                                + " troubleshooting purposes only, and will not be provided by"\r
+                                + " the client on request",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-LatestVersion",\r
+                        description = "Used only to communicate an API's latest version", response = String.class),\r
+                @ResponseHeader(name = "X-ONAP-RequestID",\r
+                        description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
+            authorizations = @Authorization(value = "basicAuth"), tags = {"PolicyType",},\r
+            extensions = {@Extension(name = "interface info",\r
+                    properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
+                        @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
+    @ApiResponses(value = {@ApiResponse(code = 401, message = "Authentication Error"),\r
+        @ApiResponse(code = 403, message = "Authorization Error"),\r
+        @ApiResponse(code = 404, message = "Resource Not Found"),\r
+        @ApiResponse(code = 500, message = "Internal Server Error")})\r
+    public Response getLatestVersionOfPolicyType(\r
+            @PathParam("policyTypeId") @ApiParam(value = "ID of policy type", required = true) String policyTypeId,\r
             @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) {\r
-        return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-            .entity(new PolicyTypeProvider().createPolicyType(body)).build();\r
+\r
+        try (PolicyTypeProvider policyTypeProvider = new PolicyTypeProvider()) {\r
+            ToscaServiceTemplate serviceTemplate = policyTypeProvider.fetchLatestPolicyTypes(policyTypeId);\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, Result.SUCCESS, HttpMethod.GET);\r
+            return makeOkResponse(requestId, serviceTemplate);\r
+        } catch (PfModelException | PfModelRuntimeException pfme) {\r
+            LOGGER.debug("GET /policytypes/{}/versions/latest", policyTypeId, pfme);\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, Result.FAILURE, HttpMethod.GET);\r
+            return makeErrorResponse(requestId, pfme);\r
+        }\r
     }\r
 \r
     /**\r
-     * Deletes all versions of a particular policy type.\r
+     * Creates a new policy type.\r
      *\r
-     * @param policyTypeId the ID of specified policy type\r
+     * @param body the body of policy type following TOSCA definition\r
      *\r
      * @return the Response object containing the results of the API operation\r
      */\r
-    @DELETE\r
-    @Path("/policytypes/{policyTypeId}")\r
-    @ApiOperation(value = "Delete all versions of a policy type",\r
-            notes = "Rule 1: pre-defined policy types cannot be deleted;"\r
-                  + "Rule 2: policy types that are in use (parameterized by a TOSCA policy) cannot be deleted."\r
-                  + "The parameterizing TOSCA policies must be deleted first;",\r
-            authorizations = @Authorization(value = "basicAuth"),\r
-            tags = { "PolicyType", },\r
-            extensions = {\r
-                    @Extension(name = "interface info", properties = {\r
-                            @ExtensionProperty(name = "api-version", value = "1.0.0"),\r
-                            @ExtensionProperty(name = "last-mod-release", value = "Dublin")\r
-                    })\r
-            })\r
-    @ApiResponses(value = {\r
-            @ApiResponse(code = 204, message = "Resources successfully deleted, no content returned",\r
+    @POST\r
+    @Path("/policytypes")\r
+    @ApiOperation(value = "Create a new policy type", notes = "Client should provide TOSCA body of the new policy type",\r
+            authorizations = @Authorization(value = "basicAuth"), tags = {"PolicyType",},\r
+            response = ToscaServiceTemplate.class,\r
             responseHeaders = {\r
-                    @ResponseHeader(name = "X-MinorVersion",\r
-                                    description = "Used to request or communicate a MINOR version back from the client"\r
-                                                + " to the server, and from the server back to the client",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-PatchVersion",\r
-                                    description = "Used only to communicate a PATCH version in a response for"\r
-                                                + " troubleshooting purposes only, and will not be provided by"\r
-                                                + " the client on request",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-LatestVersion",\r
-                                    description = "Used only to communicate an API's latest version",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-ONAP-RequestID",\r
-                                    description = "Used to track REST transactions for logging purpose",\r
-                                    response = UUID.class)\r
-            }),\r
-            @ApiResponse(code = 401, message = "Authentication Error"),\r
-            @ApiResponse(code = 403, message = "Authorization Error"),\r
-            @ApiResponse(code = 404, message = "Resource Not Found"),\r
-            @ApiResponse(code = 409, message = "Delete Conflict, Rule Violation"),\r
-            @ApiResponse(code = 500, message = "Internal Server Error")\r
-        })\r
-    public Response deleteAllVersionsOfPolicyType(\r
-            @PathParam("policyTypeId") @ApiParam(value = "ID of policy type", required = true) String policyTypeId,\r
+                @ResponseHeader(name = "X-MinorVersion",\r
+                        description = "Used to request or communicate a MINOR version back from the client"\r
+                                + " to the server, and from the server back to the client",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-PatchVersion",\r
+                        description = "Used only to communicate a PATCH version in a response for"\r
+                                + " troubleshooting purposes only, and will not be provided by"\r
+                                + " the client on request",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-LatestVersion",\r
+                        description = "Used only to communicate an API's latest version", response = String.class),\r
+                @ResponseHeader(name = "X-ONAP-RequestID",\r
+                        description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
+            extensions = {@Extension(name = "interface info",\r
+                    properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
+                        @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
+    @ApiResponses(value = {@ApiResponse(code = 400, message = "Invalid Body"),\r
+        @ApiResponse(code = 401, message = "Authentication Error"),\r
+        @ApiResponse(code = 403, message = "Authorization Error"),\r
+        @ApiResponse(code = 500, message = "Internal Server Error")})\r
+    public Response createPolicyType(\r
+            @ApiParam(value = "Entity body of policy type", required = true) ToscaServiceTemplate body,\r
             @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) {\r
-        return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-            .entity(new PolicyTypeProvider().deletePolicyTypes(policyTypeId, null)).build();\r
+\r
+        if (NetLoggerUtil.getNetworkLogger().isInfoEnabled()) {\r
+            NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, "/policytypes", toJson(body));\r
+        }\r
+\r
+        try (PolicyTypeProvider policyTypeProvider = new PolicyTypeProvider()) {\r
+            ToscaServiceTemplate serviceTemplate = policyTypeProvider.createPolicyType(body);\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, Result.SUCCESS, HttpMethod.POST);\r
+            return makeOkResponse(requestId, serviceTemplate);\r
+        } catch (PfModelException | PfModelRuntimeException pfme) {\r
+            LOGGER.debug("POST /policytypes", pfme);\r
+            updateApiStatisticsCounter(Target.POLICY_TYPE, Result.FAILURE, HttpMethod.POST);\r
+            return makeErrorResponse(requestId, pfme);\r
+        }\r
     }\r
 \r
     /**\r
@@ -438,47 +425,44 @@ public class ApiRestController {
     @Path("/policytypes/{policyTypeId}/versions/{versionId}")\r
     @ApiOperation(value = "Delete one version of a policy type",\r
             notes = "Rule 1: pre-defined policy types cannot be deleted;"\r
-                  + "Rule 2: policy types that are in use (parameterized by a TOSCA policy) cannot be deleted."\r
-                  + "The parameterizing TOSCA policies must be deleted first;",\r
-            authorizations = @Authorization(value = "basicAuth"),\r
-            tags = { "PolicyType", },\r
-            extensions = {\r
-                    @Extension(name = "interface info", properties = {\r
-                            @ExtensionProperty(name = "api-version", value = "1.0.0"),\r
-                            @ExtensionProperty(name = "last-mod-release", value = "Dublin")\r
-                    })\r
-            })\r
-    @ApiResponses(value = {\r
-            @ApiResponse(code = 204, message = "Resource successfully deleted, no content returned",\r
+                    + "Rule 2: policy types that are in use (parameterized by a TOSCA policy) cannot be deleted."\r
+                    + "The parameterizing TOSCA policies must be deleted first;",\r
+            authorizations = @Authorization(value = "basicAuth"), tags = {"PolicyType",},\r
+            response = ToscaServiceTemplate.class,\r
             responseHeaders = {\r
-                    @ResponseHeader(name = "X-MinorVersion",\r
-                                    description = "Used to request or communicate a MINOR version back from the client"\r
-                                                + " to the server, and from the server back to the client",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-PatchVersion",\r
-                                    description = "Used only to communicate a PATCH version in a response for"\r
-                                                + " troubleshooting purposes only, and will not be provided by"\r
-                                                + " the client on request",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-LatestVersion",\r
-                                    description = "Used only to communicate an API's latest version",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-ONAP-RequestID",\r
-                                    description = "Used to track REST transactions for logging purpose",\r
-                                    response = UUID.class)\r
-            }),\r
-            @ApiResponse(code = 401, message = "Authentication Error"),\r
-            @ApiResponse(code = 403, message = "Authorization Error"),\r
-            @ApiResponse(code = 404, message = "Resource Not Found"),\r
-            @ApiResponse(code = 409, message = "Delete Conflict, Rule Violation"),\r
-            @ApiResponse(code = 500, message = "Internal Server Error")\r
-        })\r
+                @ResponseHeader(name = "X-MinorVersion",\r
+                        description = "Used to request or communicate a MINOR version back from the client"\r
+                                + " to the server, and from the server back to the client",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-PatchVersion",\r
+                        description = "Used only to communicate a PATCH version in a response for"\r
+                                + " troubleshooting purposes only, and will not be provided by"\r
+                                + " the client on request",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-LatestVersion",\r
+                        description = "Used only to communicate an API's latest version", response = String.class),\r
+                @ResponseHeader(name = "X-ONAP-RequestID",\r
+                        description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
+            extensions = {@Extension(name = "interface info",\r
+                    properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
+                        @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
+    @ApiResponses(value = {@ApiResponse(code = 401, message = "Authentication Error"),\r
+        @ApiResponse(code = 403, message = "Authorization Error"),\r
+        @ApiResponse(code = 404, message = "Resource Not Found"),\r
+        @ApiResponse(code = 409, message = "Delete Conflict, Rule Violation"),\r
+        @ApiResponse(code = 500, message = "Internal Server Error")})\r
     public Response deleteSpecificVersionOfPolicyType(\r
             @PathParam("policyTypeId") @ApiParam(value = "ID of policy type", required = true) String policyTypeId,\r
             @PathParam("versionId") @ApiParam(value = "Version of policy type", required = true) String versionId,\r
             @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) {\r
-        return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-            .entity(new PolicyTypeProvider().deletePolicyTypes(policyTypeId, versionId)).build();\r
+\r
+        try (PolicyTypeProvider policyTypeProvider = new PolicyTypeProvider()) {\r
+            ToscaServiceTemplate serviceTemplate = policyTypeProvider.deletePolicyType(policyTypeId, versionId);\r
+            return makeOkResponse(requestId, serviceTemplate);\r
+        } catch (PfModelException | PfModelRuntimeException pfme) {\r
+            LOGGER.debug("DELETE /policytypes/{}/versions/{}", policyTypeId, versionId, pfme);\r
+            return makeErrorResponse(requestId, pfme);\r
+        }\r
     }\r
 \r
     /**\r
@@ -495,43 +479,43 @@ public class ApiRestController {
             notes = "Returns a list of all versions of specified policy created for the specified policy type version",\r
             response = ToscaServiceTemplate.class,\r
             responseHeaders = {\r
-                    @ResponseHeader(name = "X-MinorVersion",\r
-                                    description = "Used to request or communicate a MINOR version back from the client"\r
-                                                + " to the server, and from the server back to the client",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-PatchVersion",\r
-                                    description = "Used only to communicate a PATCH version in a response for"\r
-                                                + " troubleshooting purposes only, and will not be provided by"\r
-                                                + " the client on request",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-LatestVersion",\r
-                                    description = "Used only to communicate an API's latest version",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-ONAP-RequestID",\r
-                                    description = "Used to track REST transactions for logging purpose",\r
-                                    response = UUID.class)\r
-            },\r
-            authorizations = @Authorization(value = "basicAuth"),\r
-            tags = { "Policy", },\r
-            extensions = {\r
-                    @Extension(name = "interface info", properties = {\r
-                            @ExtensionProperty(name = "api-version", value = "1.0.0"),\r
-                            @ExtensionProperty(name = "last-mod-release", value = "Dublin")\r
-                    })\r
-            })\r
-    @ApiResponses(value = {\r
-            @ApiResponse(code = 401, message = "Authentication Error"),\r
-            @ApiResponse(code = 403, message = "Authorization Error"),\r
-            @ApiResponse(code = 404, message = "Resource Not Found"),\r
-            @ApiResponse(code = 500, message = "Internal Server Error")\r
-        })\r
+                @ResponseHeader(name = "X-MinorVersion",\r
+                        description = "Used to request or communicate a MINOR version back from the client"\r
+                                + " to the server, and from the server back to the client",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-PatchVersion",\r
+                        description = "Used only to communicate a PATCH version in a response for"\r
+                                + " troubleshooting purposes only, and will not be provided by"\r
+                                + " the client on request",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-LatestVersion",\r
+                        description = "Used only to communicate an API's latest version", response = String.class),\r
+                @ResponseHeader(name = "X-ONAP-RequestID",\r
+                        description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
+            authorizations = @Authorization(value = "basicAuth"), tags = {"Policy",},\r
+            extensions = {@Extension(name = "interface info",\r
+                    properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
+                        @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
+    @ApiResponses(value = {@ApiResponse(code = 401, message = "Authentication Error"),\r
+        @ApiResponse(code = 403, message = "Authorization Error"),\r
+        @ApiResponse(code = 404, message = "Resource Not Found"),\r
+        @ApiResponse(code = 500, message = "Internal Server Error")})\r
     public Response getAllPolicies(\r
             @PathParam("policyTypeId") @ApiParam(value = "ID of policy type", required = true) String policyTypeId,\r
-            @PathParam("policyTypeVersion")\r
-                @ApiParam(value = "Version of policy type", required = true) String policyTypeVersion,\r
+            @PathParam("policyTypeVersion") @ApiParam(value = "Version of policy type",\r
+                    required = true) String policyTypeVersion,\r
             @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) {\r
-        return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-            .entity(new PolicyProvider().fetchPolicies(policyTypeId, policyTypeVersion, null, null)).build();\r
+\r
+        try (PolicyProvider policyProvider = new PolicyProvider()) {\r
+            ToscaServiceTemplate serviceTemplate =\r
+                    policyProvider.fetchPolicies(policyTypeId, policyTypeVersion, null, null);\r
+            updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.GET);\r
+            return makeOkResponse(requestId, serviceTemplate);\r
+        } catch (PfModelException | PfModelRuntimeException pfme) {\r
+            LOGGER.debug("GET /policytypes/{}/versions/{}/policies", policyTypeId, policyTypeVersion, pfme);\r
+            updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.GET);\r
+            return makeErrorResponse(requestId, pfme);\r
+        }\r
     }\r
 \r
     /**\r
@@ -549,44 +533,44 @@ public class ApiRestController {
             notes = "Returns a list of all version details of the specified policy",\r
             response = ToscaServiceTemplate.class,\r
             responseHeaders = {\r
-                    @ResponseHeader(name = "X-MinorVersion",\r
-                                    description = "Used to request or communicate a MINOR version back from the client"\r
-                                                + " to the server, and from the server back to the client",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-PatchVersion",\r
-                                    description = "Used only to communicate a PATCH version in a response for"\r
-                                                + " troubleshooting purposes only, and will not be provided by"\r
-                                                + " the client on request",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-LatestVersion",\r
-                                    description = "Used only to communicate an API's latest version",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-ONAP-RequestID",\r
-                                    description = "Used to track REST transactions for logging purpose",\r
-                                    response = UUID.class)\r
-            },\r
-            authorizations = @Authorization(value = "basicAuth"),\r
-            tags = { "Policy", },\r
-            extensions = {\r
-                    @Extension(name = "interface info", properties = {\r
-                            @ExtensionProperty(name = "api-version", value = "1.0.0"),\r
-                            @ExtensionProperty(name = "last-mod-release", value = "Dublin")\r
-                    })\r
-            })\r
-    @ApiResponses(value = {\r
-            @ApiResponse(code = 401, message = "Authentication Error"),\r
-            @ApiResponse(code = 403, message = "Authorization Error"),\r
-            @ApiResponse(code = 404, message = "Resource Not Found"),\r
-            @ApiResponse(code = 500, message = "Internal Server Error")\r
-        })\r
+                @ResponseHeader(name = "X-MinorVersion",\r
+                        description = "Used to request or communicate a MINOR version back from the client"\r
+                                + " to the server, and from the server back to the client",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-PatchVersion",\r
+                        description = "Used only to communicate a PATCH version in a response for"\r
+                                + " troubleshooting purposes only, and will not be provided by"\r
+                                + " the client on request",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-LatestVersion",\r
+                        description = "Used only to communicate an API's latest version", response = String.class),\r
+                @ResponseHeader(name = "X-ONAP-RequestID",\r
+                        description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
+            authorizations = @Authorization(value = "basicAuth"), tags = {"Policy",},\r
+            extensions = {@Extension(name = "interface info",\r
+                    properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
+                        @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
+    @ApiResponses(value = {@ApiResponse(code = 401, message = "Authentication Error"),\r
+        @ApiResponse(code = 403, message = "Authorization Error"),\r
+        @ApiResponse(code = 404, message = "Resource Not Found"),\r
+        @ApiResponse(code = 500, message = "Internal Server Error")})\r
     public Response getAllVersionsOfPolicy(\r
             @PathParam("policyTypeId") @ApiParam(value = "ID of policy type", required = true) String policyTypeId,\r
-            @PathParam("policyTypeVersion")\r
-                @ApiParam(value = "Version of policy type", required = true) String policyTypeVersion,\r
+            @PathParam("policyTypeVersion") @ApiParam(value = "Version of policy type",\r
+                    required = true) String policyTypeVersion,\r
             @PathParam("policyId") @ApiParam(value = "ID of policy", required = true) String policyId,\r
             @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) {\r
-        return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-            .entity(new PolicyProvider().fetchPolicies(policyTypeId, policyTypeVersion, policyId, null)).build();\r
+\r
+        try (PolicyProvider policyProvider = new PolicyProvider()) {\r
+            ToscaServiceTemplate serviceTemplate =\r
+                    policyProvider.fetchPolicies(policyTypeId, policyTypeVersion, policyId, null);\r
+            updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.GET);\r
+            return makeOkResponse(requestId, serviceTemplate);\r
+        } catch (PfModelException | PfModelRuntimeException pfme) {\r
+            LOGGER.debug("/policytypes/{}/versions/{}/policies/{}", policyTypeId, policyTypeVersion, policyId, pfme);\r
+            updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.GET);\r
+            return makeErrorResponse(requestId, pfme);\r
+        }\r
     }\r
 \r
     /**\r
@@ -605,50 +589,50 @@ public class ApiRestController {
             notes = "Returns a particular version of specified policy created for the specified policy type version",\r
             response = ToscaServiceTemplate.class,\r
             responseHeaders = {\r
-                    @ResponseHeader(name = "X-MinorVersion",\r
-                                    description = "Used to request or communicate a MINOR version back from the client"\r
-                                                + " to the server, and from the server back to the client",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-PatchVersion",\r
-                                    description = "Used only to communicate a PATCH version in a response for"\r
-                                                + " troubleshooting purposes only, and will not be provided by"\r
-                                                + " the client on request",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-LatestVersion",\r
-                                    description = "Used only to communicate an API's latest version",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-ONAP-RequestID",\r
-                                    description = "Used to track REST transactions for logging purpose",\r
-                                    response = UUID.class)\r
-            },\r
-            authorizations = @Authorization(value = "basicAuth"),\r
-            tags = { "Policy", },\r
-            extensions = {\r
-                    @Extension(name = "interface info", properties = {\r
-                            @ExtensionProperty(name = "api-version", value = "1.0.0"),\r
-                            @ExtensionProperty(name = "last-mod-release", value = "Dublin")\r
-                    })\r
-            })\r
-    @ApiResponses(value = {\r
-            @ApiResponse(code = 401, message = "Authentication Error"),\r
-            @ApiResponse(code = 403, message = "Authorization Error"),\r
-            @ApiResponse(code = 404, message = "Resource Not Found"),\r
-            @ApiResponse(code = 500, message = "Internal Server Error")\r
-        })\r
+                @ResponseHeader(name = "X-MinorVersion",\r
+                        description = "Used to request or communicate a MINOR version back from the client"\r
+                                + " to the server, and from the server back to the client",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-PatchVersion",\r
+                        description = "Used only to communicate a PATCH version in a response for"\r
+                                + " troubleshooting purposes only, and will not be provided by"\r
+                                + " the client on request",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-LatestVersion",\r
+                        description = "Used only to communicate an API's latest version", response = String.class),\r
+                @ResponseHeader(name = "X-ONAP-RequestID",\r
+                        description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
+            authorizations = @Authorization(value = "basicAuth"), tags = {"Policy",},\r
+            extensions = {@Extension(name = "interface info",\r
+                    properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
+                        @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
+    @ApiResponses(value = {@ApiResponse(code = 401, message = "Authentication Error"),\r
+        @ApiResponse(code = 403, message = "Authorization Error"),\r
+        @ApiResponse(code = 404, message = "Resource Not Found"),\r
+        @ApiResponse(code = 500, message = "Internal Server Error")})\r
     public Response getSpecificVersionOfPolicy(\r
             @PathParam("policyTypeId") @ApiParam(value = "ID of policy type", required = true) String policyTypeId,\r
-            @PathParam("policyTypeVersion")\r
-                @ApiParam(value = "Version of policy type", required = true) String policyTypeVersion,\r
+            @PathParam("policyTypeVersion") @ApiParam(value = "Version of policy type",\r
+                    required = true) String policyTypeVersion,\r
             @PathParam("policyId") @ApiParam(value = "ID of policy", required = true) String policyId,\r
             @PathParam("policyVersion") @ApiParam(value = "Version of policy", required = true) String policyVersion,\r
             @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) {\r
-        return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-            .entity(new PolicyProvider().fetchPolicies(policyTypeId, policyTypeVersion,\r
-                                                       policyId, policyVersion)).build();\r
+\r
+        try (PolicyProvider policyProvider = new PolicyProvider()) {\r
+            ToscaServiceTemplate serviceTemplate =\r
+                    policyProvider.fetchPolicies(policyTypeId, policyTypeVersion, policyId, policyVersion);\r
+            updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.GET);\r
+            return makeOkResponse(requestId, serviceTemplate);\r
+        } catch (PfModelException | PfModelRuntimeException pfme) {\r
+            LOGGER.debug("GET /policytypes/{}/versions/{}/policies/{}/versions/{}", policyTypeId, policyTypeVersion,\r
+                    policyId, policyVersion, pfme);\r
+            updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.GET);\r
+            return makeErrorResponse(requestId, pfme);\r
+        }\r
     }\r
 \r
     /**\r
-     * Retrieves either latest or deployed version of a particular policy depending on query parameter.\r
+     * Retrieves the latest version of a particular policy.\r
      *\r
      * @param policyTypeId the ID of specified policy type\r
      * @param policyTypeVersion the version of specified policy type\r
@@ -657,51 +641,105 @@ public class ApiRestController {
      * @return the Response object containing the results of the API operation\r
      */\r
     @GET\r
-    @Path("/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions")\r
-    @ApiOperation(value = "Retrieve either latest or deployed version of a particular policy depending on query param",\r
-            notes = "Returns either latest or deployed version of specified policy depending on query param",\r
-            response = ToscaServiceTemplate.class,\r
+    @Path("/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/latest")\r
+    @ApiOperation(value = "Retrieve the latest version of a particular policy",\r
+            notes = "Returns the latest version of specified policy", response = ToscaServiceTemplate.class,\r
+            responseHeaders = {\r
+                @ResponseHeader(name = "X-MinorVersion",\r
+                        description = "Used to request or communicate a MINOR version back from the client"\r
+                                + " to the server, and from the server back to the client",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-PatchVersion",\r
+                        description = "Used only to communicate a PATCH version in a response for"\r
+                                + " troubleshooting purposes only, and will not be provided by"\r
+                                + " the client on request",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-LatestVersion",\r
+                        description = "Used only to communicate an API's latest version", response = String.class),\r
+                @ResponseHeader(name = "X-ONAP-RequestID",\r
+                        description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
+            authorizations = @Authorization(value = "basicAuth"), tags = {"Policy",},\r
+            extensions = {@Extension(name = "interface info",\r
+                    properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
+                        @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
+    @ApiResponses(value = {@ApiResponse(code = 401, message = "Authentication Error"),\r
+        @ApiResponse(code = 403, message = "Authorization Error"),\r
+        @ApiResponse(code = 404, message = "Resource Not Found"),\r
+        @ApiResponse(code = 500, message = "Internal Server Error")})\r
+    public Response getLatestVersionOfPolicy(\r
+            @PathParam("policyTypeId") @ApiParam(value = "ID of policy type", required = true) String policyTypeId,\r
+            @PathParam("policyTypeVersion") @ApiParam(value = "Version of policy type",\r
+                    required = true) String policyTypeVersion,\r
+            @PathParam("policyId") @ApiParam(value = "ID of policy", required = true) String policyId,\r
+            @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) {\r
+\r
+        try (PolicyProvider policyProvider = new PolicyProvider()) {\r
+            ToscaServiceTemplate serviceTemplate =\r
+                    policyProvider.fetchLatestPolicies(policyTypeId, policyTypeVersion, policyId);\r
+            updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.GET);\r
+            return makeOkResponse(requestId, serviceTemplate);\r
+        } catch (PfModelException | PfModelRuntimeException pfme) {\r
+            LOGGER.debug("GET /policytypes/{}/versions/{}/policies/{}/versions/latest", policyTypeId, policyTypeVersion,\r
+                    policyId, pfme);\r
+            updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.GET);\r
+            return makeErrorResponse(requestId, pfme);\r
+        }\r
+    }\r
+\r
+    /**\r
+     * Retrieves deployed versions of a particular policy in PDP groups.\r
+     *\r
+     * @param policyTypeId the ID of specified policy type\r
+     * @param policyTypeVersion the version of specified policy type\r
+     * @param policyId the ID of specified policy\r
+     *\r
+     * @return the Response object containing the results of the API operation\r
+     */\r
+    @GET\r
+    @Path("/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/deployed")\r
+    @ApiOperation(value = "Retrieve deployed versions of a particular policy in pdp groups",\r
+            notes = "Returns deployed versions of specified policy in pdp groups", response = ToscaPolicy.class,\r
+            responseContainer = "List",\r
             responseHeaders = {\r
-                    @ResponseHeader(name = "X-MinorVersion",\r
-                                    description = "Used to request or communicate a MINOR version back from the client"\r
-                                                + " to the server, and from the server back to the client",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-PatchVersion",\r
-                                    description = "Used only to communicate a PATCH version in a response for"\r
-                                                + " troubleshooting purposes only, and will not be provided by"\r
-                                                + " the client on request",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-LatestVersion",\r
-                                    description = "Used only to communicate an API's latest version",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-ONAP-RequestID",\r
-                                    description = "Used to track REST transactions for logging purpose",\r
-                                    response = UUID.class)\r
-            },\r
-            authorizations = @Authorization(value = "basicAuth"),\r
-            tags = { "Policy", },\r
-            extensions = {\r
-                    @Extension(name = "interface info", properties = {\r
-                            @ExtensionProperty(name = "api-version", value = "1.0.0"),\r
-                            @ExtensionProperty(name = "last-mod-release", value = "Dublin")\r
-                    })\r
-            })\r
-    @ApiResponses(value = {\r
-            @ApiResponse(code = 401, message = "Authentication Error"),\r
-            @ApiResponse(code = 403, message = "Authorization Error"),\r
-            @ApiResponse(code = 404, message = "Resource Not Found"),\r
-            @ApiResponse(code = 500, message = "Internal Server Error")\r
-        })\r
-    public Response getEitherLatestOrDeployedVersionOfPolicy(\r
+                @ResponseHeader(name = "X-MinorVersion",\r
+                        description = "Used to request or communicate a MINOR version back from the client"\r
+                                + " to the server, and from the server back to the client",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-PatchVersion",\r
+                        description = "Used only to communicate a PATCH version in a response for"\r
+                                + " troubleshooting purposes only, and will not be provided by"\r
+                                + " the client on request",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-LatestVersion",\r
+                        description = "Used only to communicate an API's latest version", response = String.class),\r
+                @ResponseHeader(name = "X-ONAP-RequestID",\r
+                        description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
+            authorizations = @Authorization(value = "basicAuth"), tags = {"Policy",},\r
+            extensions = {@Extension(name = "interface info",\r
+                    properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
+                        @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
+    @ApiResponses(value = {@ApiResponse(code = 401, message = "Authentication Error"),\r
+        @ApiResponse(code = 403, message = "Authorization Error"),\r
+        @ApiResponse(code = 404, message = "Resource Not Found"),\r
+        @ApiResponse(code = 500, message = "Internal Server Error")})\r
+    public Response getDeployedVersionsOfPolicy(\r
             @PathParam("policyTypeId") @ApiParam(value = "ID of policy type", required = true) String policyTypeId,\r
-            @PathParam("policyTypeVersion")\r
-                @ApiParam(value = "Version of policy type", required = true) String policyTypeVersion,\r
+            @PathParam("policyTypeVersion") @ApiParam(value = "Version of policy type",\r
+                    required = true) String policyTypeVersion,\r
             @PathParam("policyId") @ApiParam(value = "ID of policy", required = true) String policyId,\r
-            @QueryParam("type")\r
-                @ApiParam(value = "Version that can only be 'latest' or 'deployed'", required = true) String type,\r
             @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) {\r
-        return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-            .entity(new PolicyProvider().fetchPolicies(policyTypeId, policyTypeVersion, policyId, type)).build();\r
+\r
+        try (PolicyProvider policyProvider = new PolicyProvider()) {\r
+            Map<Pair<String, String>, List<ToscaPolicy>> deployedPolicies =\r
+                    policyProvider.fetchDeployedPolicies(policyTypeId, policyTypeVersion, policyId);\r
+            updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.GET);\r
+            return makeOkResponse(requestId, deployedPolicies);\r
+        } catch (PfModelException | PfModelRuntimeException pfme) {\r
+            LOGGER.debug("GET /policytypes/{}/versions/{}/policies/{}/versions/deployed", policyTypeId,\r
+                    policyTypeVersion, policyId, pfme);\r
+            updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.GET);\r
+            return makeErrorResponse(requestId, pfme);\r
+        }\r
     }\r
 \r
     /**\r
@@ -715,107 +753,107 @@ public class ApiRestController {
      */\r
     @POST\r
     @Path("/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies")\r
-    @Consumes("application/json")\r
-    @Produces("application/json")\r
     @ApiOperation(value = "Create a new policy for a policy type version",\r
             notes = "Client should provide TOSCA body of the new policy",\r
-            authorizations = @Authorization(value = "basicAuth"),\r
-            tags = { "Policy", },\r
-            extensions = {\r
-                    @Extension(name = "interface info", properties = {\r
-                            @ExtensionProperty(name = "api-version", value = "1.0.0"),\r
-                            @ExtensionProperty(name = "last-mod-release", value = "Dublin")\r
-                    })\r
-            })\r
-    @ApiResponses(value = {\r
-            @ApiResponse(code = 201, message = "Resource successfully created",\r
+            authorizations = @Authorization(value = "basicAuth"), tags = {"Policy",},\r
+            response = ToscaServiceTemplate.class,\r
             responseHeaders = {\r
-                    @ResponseHeader(name = "X-MinorVersion",\r
-                                    description = "Used to request or communicate a MINOR version back from the client"\r
-                                                + " to the server, and from the server back to the client",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-PatchVersion",\r
-                                    description = "Used only to communicate a PATCH version in a response for"\r
-                                                + " troubleshooting purposes only, and will not be provided by"\r
-                                                + " the client on request",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-LatestVersion",\r
-                                    description = "Used only to communicate an API's latest version",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-ONAP-RequestID",\r
-                                    description = "Used to track REST transactions for logging purpose",\r
-                                    response = UUID.class)\r
-            }),\r
-            @ApiResponse(code = 400, message = "Invalid Body"),\r
-            @ApiResponse(code = 401, message = "Authentication Error"),\r
-            @ApiResponse(code = 403, message = "Authorization Error"),\r
-            @ApiResponse(code = 404, message = "Resource Not Found"),\r
-            @ApiResponse(code = 500, message = "Internal Server Error")\r
-        })\r
+                @ResponseHeader(name = "X-MinorVersion",\r
+                        description = "Used to request or communicate a MINOR version back from the client"\r
+                                + " to the server, and from the server back to the client",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-PatchVersion",\r
+                        description = "Used only to communicate a PATCH version in a response for"\r
+                                + " troubleshooting purposes only, and will not be provided by"\r
+                                + " the client on request",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-LatestVersion",\r
+                        description = "Used only to communicate an API's latest version", response = String.class),\r
+                @ResponseHeader(name = "X-ONAP-RequestID",\r
+                        description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
+            extensions = {@Extension(name = "interface info",\r
+                    properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
+                        @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
+    @ApiResponses(value = {@ApiResponse(code = 400, message = "Invalid Body"),\r
+        @ApiResponse(code = 401, message = "Authentication Error"),\r
+        @ApiResponse(code = 403, message = "Authorization Error"),\r
+        @ApiResponse(code = 404, message = "Resource Not Found"),\r
+        @ApiResponse(code = 500, message = "Internal Server Error")})\r
     public Response createPolicy(\r
             @PathParam("policyTypeId") @ApiParam(value = "ID of policy type", required = true) String policyTypeId,\r
-            @PathParam("policyTypeVersion")\r
-                @ApiParam(value = "Version of policy type", required = true) String policyTypeVersion,\r
+            @PathParam("policyTypeVersion") @ApiParam(value = "Version of policy type",\r
+                    required = true) String policyTypeVersion,\r
             @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId,\r
             @ApiParam(value = "Entity body of policy", required = true) ToscaServiceTemplate body) {\r
-        return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-            .entity(new PolicyProvider().createPolicy(policyTypeId, policyTypeVersion, body)).build();\r
+\r
+        if (NetLoggerUtil.getNetworkLogger().isInfoEnabled()) {\r
+            NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST,\r
+                    "/policytypes/" + policyTypeId + "/versions/" + policyTypeVersion + "/policies", toJson(body));\r
+        }\r
+\r
+        try (PolicyProvider policyProvider = new PolicyProvider()) {\r
+            ToscaServiceTemplate serviceTemplate = policyProvider.createPolicy(policyTypeId, policyTypeVersion, body);\r
+            updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.POST);\r
+            return makeOkResponse(requestId, serviceTemplate);\r
+        } catch (PfModelException | PfModelRuntimeException pfme) {\r
+            LOGGER.debug("POST /policytypes/{}/versions/{}/policies", policyTypeId, policyTypeVersion, pfme);\r
+            updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.POST);\r
+            return makeErrorResponse(requestId, pfme);\r
+        }\r
     }\r
 \r
     /**\r
-     * Deletes all versions of a particular policy.\r
+     * Creates one or more new policies in one call.\r
      *\r
-     * @param policyTypeId the ID of specified policy type\r
-     * @param policyTypeVersion the version of specified policy type\r
-     * @param policyId the ID of specified policy\r
+     * @param body the body of policy following TOSCA definition\r
      *\r
      * @return the Response object containing the results of the API operation\r
      */\r
-    @DELETE\r
-    @Path("/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}")\r
-    @ApiOperation(value = "Delete all versions of a policy",\r
-            notes = "Rule: the version that has been deployed in PDP group(s) cannot be deleted",\r
-            authorizations = @Authorization(value = "basicAuth"),\r
-            tags = { "Policy", },\r
-            extensions = {\r
-                    @Extension(name = "interface info", properties = {\r
-                            @ExtensionProperty(name = "api-version", value = "1.0.0"),\r
-                            @ExtensionProperty(name = "last-mod-release", value = "Dublin")\r
-                    })\r
-            })\r
-    @ApiResponses(value = {\r
-            @ApiResponse(code = 204, message = "Resources successfully deleted, no content returned",\r
+    @POST\r
+    @Path("/policies")\r
+    @ApiOperation(value = "Create one or more new policies",\r
+            notes = "Client should provide TOSCA body of the new polic(ies)",\r
+            authorizations = @Authorization(value = "basicAuth"), tags = {"Policy",},\r
+            response = ToscaServiceTemplate.class,\r
             responseHeaders = {\r
-                    @ResponseHeader(name = "X-MinorVersion",\r
-                                    description = "Used to request or communicate a MINOR version back from the client"\r
-                                                + " to the server, and from the server back to the client",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-PatchVersion",\r
-                                    description = "Used only to communicate a PATCH version in a response for"\r
-                                                + " troubleshooting purposes only, and will not be provided by"\r
-                                                + " the client on request",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-LatestVersion",\r
-                                    description = "Used only to communicate an API's latest version",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-ONAP-RequestID",\r
-                                    description = "Used to track REST transactions for logging purpose",\r
-                                    response = UUID.class)\r
-            }),\r
-            @ApiResponse(code = 401, message = "Authentication Error"),\r
-            @ApiResponse(code = 403, message = "Authorization Error"),\r
-            @ApiResponse(code = 404, message = "Resource Not Found"),\r
-            @ApiResponse(code = 409, message = "Delete Conflict, Rule Violation"),\r
-            @ApiResponse(code = 500, message = "Internal Server Error")\r
-        })\r
-    public Response deleteAllVersionsOfPolicy(\r
-            @PathParam("policyTypeId") @ApiParam(value = "ID of policy type", required = true) String policyTypeId,\r
-            @PathParam("policyTypeVersion")\r
-                @ApiParam(value = "Version of policy type", required = true) String policyTypeVersion,\r
-            @PathParam("policyId") @ApiParam(value = "ID of policy", required = true) String policyId,\r
-            @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) {\r
-        return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-            .entity(new PolicyProvider().deletePolicies(policyTypeId, policyTypeVersion, policyId, null)).build();\r
+                @ResponseHeader(name = "X-MinorVersion",\r
+                        description = "Used to request or communicate a MINOR version back from the client"\r
+                                + " to the server, and from the server back to the client",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-PatchVersion",\r
+                        description = "Used only to communicate a PATCH version in a response for"\r
+                                + " troubleshooting purposes only, and will not be provided by"\r
+                                + " the client on request",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-LatestVersion",\r
+                        description = "Used only to communicate an API's latest version", response = String.class),\r
+                @ResponseHeader(name = "X-ONAP-RequestID",\r
+                        description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
+            extensions = {@Extension(name = "interface info",\r
+                    properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
+                        @ExtensionProperty(name = "last-mod-release", value = "El Alto")})})\r
+    @ApiResponses(value = {@ApiResponse(code = 400, message = "Invalid Body"),\r
+        @ApiResponse(code = 401, message = "Authentication Error"),\r
+        @ApiResponse(code = 403, message = "Authorization Error"),\r
+        @ApiResponse(code = 404, message = "Resource Not Found"),\r
+        @ApiResponse(code = 500, message = "Internal Server Error")})\r
+    public Response createPolicies(\r
+            @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId,\r
+            @ApiParam(value = "Entity body of policy", required = true) ToscaServiceTemplate body) {\r
+\r
+        if (NetLoggerUtil.getNetworkLogger().isInfoEnabled()) {\r
+            NetLoggerUtil.log(EventType.IN, CommInfrastructure.REST, "/policies", toJson(body));\r
+        }\r
+\r
+        try (PolicyProvider policyProvider = new PolicyProvider()) {\r
+            ToscaServiceTemplate serviceTemplate = policyProvider.createPolicies(body);\r
+            updateApiStatisticsCounter(Target.POLICY, Result.SUCCESS, HttpMethod.POST);\r
+            return makeOkResponse(requestId, serviceTemplate);\r
+        } catch (PfModelException | PfModelRuntimeException pfme) {\r
+            LOGGER.debug("POST /policies", pfme);\r
+            updateApiStatisticsCounter(Target.POLICY, Result.FAILURE, HttpMethod.POST);\r
+            return makeErrorResponse(requestId, pfme);\r
+        }\r
     }\r
 \r
     /**\r
@@ -832,60 +870,127 @@ public class ApiRestController {
     @Path("/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies/{policyId}/versions/{policyVersion}")\r
     @ApiOperation(value = "Delete a particular version of a policy",\r
             notes = "Rule: the version that has been deployed in PDP group(s) cannot be deleted",\r
-            authorizations = @Authorization(value = "basicAuth"),\r
-            tags = { "Policy", },\r
-            extensions = {\r
-                    @Extension(name = "interface info", properties = {\r
-                            @ExtensionProperty(name = "api-version", value = "1.0.0"),\r
-                            @ExtensionProperty(name = "last-mod-release", value = "Dublin")\r
-                    })\r
-            })\r
-    @ApiResponses(value = {\r
-            @ApiResponse(code = 204, message = "Resource successfully deleted, no content returned",\r
+            authorizations = @Authorization(value = "basicAuth"), tags = {"Policy",},\r
+            response = ToscaServiceTemplate.class,\r
             responseHeaders = {\r
-                    @ResponseHeader(name = "X-MinorVersion",\r
-                                    description = "Used to request or communicate a MINOR version back from the client"\r
-                                                + " to the server, and from the server back to the client",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-PatchVersion",\r
-                                    description = "Used only to communicate a PATCH version in a response for"\r
-                                                + " troubleshooting purposes only, and will not be provided by"\r
-                                                + " the client on request",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-LatestVersion",\r
-                                    description = "Used only to communicate an API's latest version",\r
-                                    response = String.class),\r
-                    @ResponseHeader(name = "X-ONAP-RequestID",\r
-                                    description = "Used to track REST transactions for logging purpose",\r
-                                    response = UUID.class)\r
-            }),\r
-            @ApiResponse(code = 401, message = "Authentication Error"),\r
-            @ApiResponse(code = 403, message = "Authorization Error"),\r
-            @ApiResponse(code = 404, message = "Resource Not Found"),\r
-            @ApiResponse(code = 409, message = "Delete Conflict, Rule Violation"),\r
-            @ApiResponse(code = 500, message = "Internal Server Error")\r
-        })\r
+                @ResponseHeader(name = "X-MinorVersion",\r
+                        description = "Used to request or communicate a MINOR version back from the client"\r
+                                + " to the server, and from the server back to the client",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-PatchVersion",\r
+                        description = "Used only to communicate a PATCH version in a response for"\r
+                                + " troubleshooting purposes only, and will not be provided by"\r
+                                + " the client on request",\r
+                        response = String.class),\r
+                @ResponseHeader(name = "X-LatestVersion",\r
+                        description = "Used only to communicate an API's latest version", response = String.class),\r
+                @ResponseHeader(name = "X-ONAP-RequestID",\r
+                        description = "Used to track REST transactions for logging purpose", response = UUID.class)},\r
+            extensions = {@Extension(name = "interface info",\r
+                    properties = {@ExtensionProperty(name = "api-version", value = "1.0.0"),\r
+                        @ExtensionProperty(name = "last-mod-release", value = "Dublin")})})\r
+    @ApiResponses(value = {@ApiResponse(code = 401, message = "Authentication Error"),\r
+        @ApiResponse(code = 403, message = "Authorization Error"),\r
+        @ApiResponse(code = 404, message = "Resource Not Found"),\r
+        @ApiResponse(code = 409, message = "Delete Conflict, Rule Violation"),\r
+        @ApiResponse(code = 500, message = "Internal Server Error")})\r
     public Response deleteSpecificVersionOfPolicy(\r
             @PathParam("policyTypeId") @ApiParam(value = "PolicyType ID", required = true) String policyTypeId,\r
-            @PathParam("policyTypeVersion")\r
-                @ApiParam(value = "Version of policy type", required = true) String policyTypeVersion,\r
+            @PathParam("policyTypeVersion") @ApiParam(value = "Version of policy type",\r
+                    required = true) String policyTypeVersion,\r
             @PathParam("policyId") @ApiParam(value = "ID of policy", required = true) String policyId,\r
             @PathParam("policyVersion") @ApiParam(value = "Version of policy", required = true) String policyVersion,\r
             @HeaderParam("X-ONAP-RequestID") @ApiParam("RequestID for http transaction") UUID requestId) {\r
-        return addLoggingHeaders(addVersionControlHeaders(Response.status(Response.Status.OK)), requestId)\r
-            .entity(new PolicyProvider().deletePolicies(policyTypeId, policyTypeVersion,\r
-                                                        policyId, policyVersion)).build();\r
+\r
+        try (PolicyProvider policyProvider = new PolicyProvider()) {\r
+            ToscaServiceTemplate serviceTemplate =\r
+                    policyProvider.deletePolicy(policyTypeId, policyTypeVersion, policyId, policyVersion);\r
+            return makeOkResponse(requestId, serviceTemplate);\r
+        } catch (PfModelException | PfModelRuntimeException pfme) {\r
+            LOGGER.debug("DELETE /policytypes/{}/versions/{}/policies/{}/versions/{}", policyTypeId, policyTypeVersion,\r
+                    policyId, policyVersion, pfme);\r
+            return makeErrorResponse(requestId, pfme);\r
+        }\r
+    }\r
+\r
+    private enum Target {\r
+        POLICY,\r
+        POLICY_TYPE,\r
+        OTHER\r
+    }\r
+\r
+    private enum Result {\r
+        SUCCESS,\r
+        FAILURE\r
+    }\r
+\r
+    private enum HttpMethod {\r
+        POST,\r
+        GET\r
     }\r
 \r
-    private ResponseBuilder addVersionControlHeaders(ResponseBuilder rb) {\r
-        return rb.header("X-MinorVersion", "0").header("X-PatchVersion", "0").header("X-LatestVersion", "1.0.0");\r
+    private void updateApiStatisticsCounter(Target target, Result result, HttpMethod http) {\r
+\r
+        ApiStatisticsManager.updateTotalApiCallCount();\r
+\r
+        switch (target) {\r
+            case POLICY:\r
+                updatePolicyStats(result, http);\r
+                break;\r
+            case POLICY_TYPE:\r
+                updatePolicyTypeStats(result, http);\r
+                break;\r
+            default:\r
+                ApiStatisticsManager.updateApiCallSuccessCount();\r
+                break;\r
+        }\r
+    }\r
+\r
+    private void updatePolicyStats(Result result, HttpMethod http) {\r
+        if (result == Result.SUCCESS) {\r
+            if (http == HttpMethod.GET) {\r
+                ApiStatisticsManager.updateApiCallSuccessCount();\r
+                ApiStatisticsManager.updateTotalPolicyGetCount();\r
+                ApiStatisticsManager.updatePolicyGetSuccessCount();\r
+            } else if (http == HttpMethod.POST) {\r
+                ApiStatisticsManager.updateApiCallSuccessCount();\r
+                ApiStatisticsManager.updateTotalPolicyPostCount();\r
+                ApiStatisticsManager.updatePolicyPostSuccessCount();\r
+            }\r
+        } else {\r
+            if (http == HttpMethod.GET) {\r
+                ApiStatisticsManager.updateApiCallFailureCount();\r
+                ApiStatisticsManager.updateTotalPolicyGetCount();\r
+                ApiStatisticsManager.updatePolicyGetFailureCount();\r
+            } else {\r
+                ApiStatisticsManager.updateApiCallFailureCount();\r
+                ApiStatisticsManager.updateTotalPolicyPostCount();\r
+                ApiStatisticsManager.updatePolicyPostFailureCount();\r
+            }\r
+        }\r
     }\r
 \r
-    private ResponseBuilder addLoggingHeaders(ResponseBuilder rb, UUID requestId) {\r
-        if (requestId == null) {\r
-            // Generate a random uuid if client does not embed requestId in rest request\r
-            return rb.header("X-ONAP-RequestID", UUID.randomUUID());\r
+    private void updatePolicyTypeStats(Result result, HttpMethod http) {\r
+        if (result == Result.SUCCESS) {\r
+            if (http == HttpMethod.GET) {\r
+                ApiStatisticsManager.updateApiCallSuccessCount();\r
+                ApiStatisticsManager.updateTotalPolicyTypeGetCount();\r
+                ApiStatisticsManager.updatePolicyTypeGetSuccessCount();\r
+            } else if (http == HttpMethod.POST) {\r
+                ApiStatisticsManager.updateApiCallSuccessCount();\r
+                ApiStatisticsManager.updatePolicyTypePostSuccessCount();\r
+                ApiStatisticsManager.updatePolicyTypePostSuccessCount();\r
+            }\r
+        } else {\r
+            if (http == HttpMethod.GET) {\r
+                ApiStatisticsManager.updateApiCallFailureCount();\r
+                ApiStatisticsManager.updateTotalPolicyTypeGetCount();\r
+                ApiStatisticsManager.updatePolicyTypeGetFailureCount();\r
+            } else {\r
+                ApiStatisticsManager.updateApiCallFailureCount();\r
+                ApiStatisticsManager.updateTotalPolicyTypePostCount();\r
+                ApiStatisticsManager.updatePolicyTypePostFailureCount();\r
+            }\r
         }\r
-        return rb.header("X-ONAP-RequestID", requestId);\r
     }\r
-}\r
+}
\ No newline at end of file