From: elinuxhenrik <henrik.b.andersson@est.tech>
Date: Fri, 3 Apr 2020 08:58:13 +0000 (+0200)
Subject: Change name of policy ID in API
X-Git-Tag: BronzeRC0~15
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=626cd0f862a3513f9267fed66c21bf9053b7b163;p=portal%2Fnonrtric-controlpanel.git

Change name of policy ID in API

In some methods the policy ID parameter was named "instance". It is
changed to "id".

Change-Id: Iacbf97a6310702335c734caef049d3ebd0c4ebfb
Issue-ID: NONRTRIC-152
Signed-off-by: elinuxhenrik <henrik.b.andersson@est.tech>
---

diff --git a/.gitignore b/.gitignore
index 1fe9c87..37ae7b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@
 /dist
 /tmp
 /out-tsc
+package-lock.json
 
 # dependencies
 /node
diff --git a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/policyagentapi/PolicyAgentApiImpl.java b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/policyagentapi/PolicyAgentApiImpl.java
index 86eb81e..c084443 100644
--- a/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/policyagentapi/PolicyAgentApiImpl.java
+++ b/webapp-backend/src/main/java/org/oransc/portal/nonrtric/controlpanel/policyagentapi/PolicyAgentApiImpl.java
@@ -138,7 +138,7 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
 
     @Override
     public ResponseEntity<Object> getPolicyInstance(String id) {
-        String url = baseUrl() + "/policy?instance={id}";
+        String url = baseUrl() + "/policy?id={id}";
         Map<String, ?> uriVariables = Map.of("id", id);
 
         return this.restTemplate.getForEntity(url, Object.class, uriVariables);
@@ -147,10 +147,10 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
     @Override
     public ResponseEntity<String> putPolicy(String policyTypeIdString, String policyInstanceId, Object json,
         String ric) {
-        String url = baseUrl() + "/policy?type={type}&instance={instance}&ric={ric}&service={service}";
+        String url = baseUrl() + "/policy?type={type}&id={id}&ric={ric}&service={service}";
         Map<String, ?> uriVariables = Map.of( //
             "type", policyTypeIdString, //
-            "instance", policyInstanceId, //
+            "id", policyInstanceId, //
             "ric", ric, //
             "service", "controlpanel");
 
@@ -164,8 +164,8 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
 
     @Override
     public ResponseEntity<String> deletePolicy(String policyInstanceId) {
-        String url = baseUrl() + "/policy?instance={instance}";
-        Map<String, ?> uriVariables = Map.of("instance", policyInstanceId);
+        String url = baseUrl() + "/policy?id={id}";
+        Map<String, ?> uriVariables = Map.of("id", policyInstanceId);
         try {
             this.restTemplate.delete(url, uriVariables);
             return new ResponseEntity<>(HttpStatus.OK);
diff --git a/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/policyagentapi/PolicyAgentApiImplTest.java b/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/policyagentapi/PolicyAgentApiImplTest.java
index dacb303..b376c3b 100644
--- a/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/policyagentapi/PolicyAgentApiImplTest.java
+++ b/webapp-backend/src/test/java/org/oransc/portal/nonrtric/controlpanel/policyagentapi/PolicyAgentApiImplTest.java
@@ -64,9 +64,9 @@ public class PolicyAgentApiImplTest {
     private static final String URL_PREFIX = "UrlPrefix";
     private static final String URL_POLICY_SCHEMAS = "/policy_schemas";
     private static final String URL_POLICY_INSTANCES = "/policies?type={type}";
-    private static final String URL_POLICY_INSTANCE = "/policy?instance={id}";
-    private static final String URL_PUT_POLICY = "/policy?type={type}&instance={instance}&ric={ric}&service={service}";
-    private static final String URL_DELETE_POLICY = "/policy?instance={instance}";
+    private static final String URL_POLICY_INSTANCE = "/policy?id={id}";
+    private static final String URL_PUT_POLICY = "/policy?type={type}&id={id}&ric={ric}&service={service}";
+    private static final String URL_DELETE_POLICY = "/policy?id={id}";
     private static final String URL_RIC_INFO = "/rics?policyType={typeName}";
     private static final String POLICY_TYPE_1_ID = "type1";
     private static final String POLICY_TYPE_1_VALID = "{\"title\":\"type1\"}";
@@ -200,7 +200,7 @@ public class PolicyAgentApiImplTest {
         HttpEntity<Object> jsonHttpEntity = createJsonHttpEntity(POLICY_1_VALID);
         Map<String, ?> uriVariables = Map.of( //
             "type", POLICY_TYPE_1_ID, //
-            "instance", POLICY_1_ID, //
+            "id", POLICY_1_ID, //
             "ric", RIC_1_ID, //
             "service", "controlpanel");
         doThrow(new RestClientException(CLIENT_ERROR_MESSAGE)).when(restTemplateMock)
@@ -219,7 +219,7 @@ public class PolicyAgentApiImplTest {
         HttpEntity<Object> jsonHttpEntity = createJsonHttpEntity(POLICY_1_VALID);
         Map<String, ?> uriVariables = Map.of( //
             "type", POLICY_TYPE_1_ID, //
-            "instance", POLICY_1_ID, //
+            "id", POLICY_1_ID, //
             "ric", RIC_1_ID, //
             "service", "controlpanel");
 
@@ -233,7 +233,7 @@ public class PolicyAgentApiImplTest {
 
     @Test
     public void testDeletePolicyFailure() {
-        Map<String, ?> uriVariables = Map.of("instance", POLICY_1_ID);
+        Map<String, ?> uriVariables = Map.of("id", POLICY_1_ID);
         doThrow(new RestClientException(CLIENT_ERROR_MESSAGE)).when(restTemplateMock)
             .delete(eq(URL_PREFIX + URL_DELETE_POLICY), eq(uriVariables));
 
@@ -246,7 +246,7 @@ public class PolicyAgentApiImplTest {
 
     @Test
     public void testDeletePolicySuccess() {
-        Map<String, ?> uriVariables = Map.of("instance", POLICY_1_ID);
+        Map<String, ?> uriVariables = Map.of("id", POLICY_1_ID);
 
         ResponseEntity<String> returnedResp = apiUnderTest.deletePolicy(POLICY_1_ID);