From 0b310105b894996bcc87e645ce39f967b6f03b46 Mon Sep 17 00:00:00 2001 From: Ram Krishna Verma Date: Thu, 19 Aug 2021 15:34:00 -0400 Subject: Use generic create policy api Change lifecycycle api forwarder to use generic create policy api for creating policies. Hence, no need to parse the tosca template and find fields to build the specific url. Issue-ID: POLICY-3545 Change-Id: I848df3cf2e0cbb9136120769293cc466d660036a Signed-off-by: Ram Krishna Verma (cherry picked from commit 784b94f5872721fadf39cc459e02bd77d9e7c796) --- .../forwarding/lifecycle/api/LifecycleApiPolicyForwarder.java | 7 +++---- .../forwarding/testclasses/LifecycycleApiSimulatorEndpoint.java | 3 ++- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarder.java b/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarder.java index a4a5e057..f9c1157c 100644 --- a/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarder.java +++ b/plugins/forwarding-plugins/src/main/java/org/onap/policy/distribution/forwarding/lifecycle/api/LifecycleApiPolicyForwarder.java @@ -56,7 +56,8 @@ import org.slf4j.LoggerFactory; public class LifecycleApiPolicyForwarder implements PolicyForwarder { private static final String DEPLOY_POLICY_URI = "/policy/pap/v1/pdps/policies"; - private static final String CREATE_POLICY_TYPE_URI = "/policy/api/v1/policytypes/"; + private static final String CREATE_POLICY_TYPE_URI = "/policy/api/v1/policytypes"; + private static final String CREATE_POLICY_URI = "/policy/api/v1/policies"; private static final Logger LOGGER = LoggerFactory.getLogger(LifecycleApiPolicyForwarder.class); private LifecycleApiForwarderParameters forwarderParameters; @@ -116,10 +117,8 @@ public class LifecycleApiPolicyForwarder implements PolicyForwarder { } private Response createPolicy(final ToscaServiceTemplate toscaServiceTemplate) throws PolicyForwardingException { - final ToscaPolicy policy = toscaServiceTemplate.getToscaTopologyTemplate().getPolicies().get(0).entrySet() - .iterator().next().getValue(); return invokeHttpClient(Entity.entity(toscaServiceTemplate, MediaType.APPLICATION_JSON), - CREATE_POLICY_TYPE_URI + policy.getType() + "/versions/" + policy.getTypeVersion() + "/policies", true); + CREATE_POLICY_URI, true); } private Response deployPolicy(final ToscaServiceTemplate toscaServiceTemplate) throws PolicyForwardingException { diff --git a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/LifecycycleApiSimulatorEndpoint.java b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/LifecycycleApiSimulatorEndpoint.java index 2b38434c..4a881cb0 100644 --- a/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/LifecycycleApiSimulatorEndpoint.java +++ b/plugins/forwarding-plugins/src/test/java/org/onap/policy/distribution/forwarding/testclasses/LifecycycleApiSimulatorEndpoint.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2019 Nordix Foundation. + * Modifications Copyright (C) 2021 Bell Canada. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -64,7 +65,7 @@ public class LifecycycleApiSimulatorEndpoint { * @return the response object */ @POST - @Path("/api/v1/policytypes/{policyTypeId}/versions/{policyTypeVersion}/policies") + @Path("/api/v1/policies") @Consumes(MediaType.APPLICATION_JSON) @Produces(MediaType.APPLICATION_JSON) public Response createPolicies(@PathParam("policyTypeId") final String policyTypeId, -- cgit 1.2.3-korg