Update baseUrl of pms_v2.0

Issue-ID: NONRTRIC-412
Signed-off-by: ecaiyanlinux <martin.c.yan@est.tech>
Change-Id: Ia494147f341fb09ed05cba7ce83be5ff6e9f83de

diff --git a/nonrtric-gateway/config/application.yaml b/nonrtric-gateway/config/application.yaml
index 57d94d7..ce50c44 100644 (file)
--- a/nonrtric-gateway/config/application.yaml
+++ b/nonrtric-gateway/config/application.yaml
@@ -29,11 +29,11 @@ spring:
       - id: policytypes
         uri: https://localhost:8433
         predicates:
-        - Path=/v2/policy-types/**
+        - Path=/a1-policy/v2/policy-types/**
       - id: policies
         uri: https://localhost:8433
         predicates:
-        - Path=/v2/policies
+        - Path=/a1-policy/v2/policies
 management:
   endpoint:
     gateway:

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 9e30c51..ee961ab 100644 (file)
--- 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
@@ -72,7 +72,7 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
     @Override
     public ResponseEntity<String> getAllPolicyTypes() {
         try {
-            final String url = "/v2/policy-types";
+            final String url = "/a1-policy/v2/policy-types";
             ResponseEntity<String> rsp = webClient.getForEntity(url).block();
             if (!rsp.getStatusCode().is2xxSuccessful()) {
                 return rsp;
@@ -99,7 +99,7 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
 
     public JsonObject getIndividualPolicySchema(String id) {
         try {
-            final String url = "/v2/policy-types/" + id;
+            final String url = "/a1-policy/v2/policy-types/" + id;
             ResponseEntity<String> rsp = webClient.getForEntity(url).block();
             if (!rsp.getStatusCode().is2xxSuccessful()) {
                 return null;
@@ -118,7 +118,7 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
     @Override
     public ResponseEntity<String> getPolicyInstancesForType(String type) {
         try {
-            String url = "/v2/policies?policytype_id=" + type;
+            String url = "/a1-policy/v2/policies?policytype_id=" + type;
             ResponseEntity<String> rsp = webClient.getForEntity(url).block();
             if (!rsp.getStatusCode().is2xxSuccessful()) {
                 return rsp;
@@ -141,7 +141,7 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
 
     public ResponseEntity<Object> getIndividualPolicyInstance(String id) {
         try {
-            String url = "/v2/policies/" + id;
+            String url = "/a1-policy/v2/policies/" + id;
             ResponseEntity<String> rsp = webClient.getForEntity(url).block();
             JsonObject obj = JsonParser.parseString(rsp.getBody()).getAsJsonObject();
 
@@ -162,7 +162,7 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
 
     public ResponseEntity<String> getPolicyStatus(String id) {
         try {
-            String url = "/v2/policies/" + id + "/status";
+            String url = "/a1-policy/v2/policies/" + id + "/status";
             ResponseEntity<String> rsp = webClient.getForEntity(url).block();
             return new ResponseEntity<>(rsp.getBody(), rsp.getStatusCode());
         } catch (Exception e) {
@@ -181,7 +181,7 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
     @Override
     public ResponseEntity<String> putPolicy(String policyTypeIdString, String policyInstanceId, Object json,
         String ric) {
-        String url = "/v2/policies/";
+        String url = "/a1-policy/v2/policies/";
 
         JsonElement data = JsonParser.parseString(json.toString()).getAsJsonObject();
 
@@ -205,7 +205,7 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
 
     @Override
     public ResponseEntity<String> deletePolicy(String policyInstanceId) {
-        String url = "/v2/policies/" + policyInstanceId;
+        String url = "/a1-policy/v2/policies/" + policyInstanceId;
         try {
             webClient.deleteForEntity(url).block();
             return new ResponseEntity<>(HttpStatus.OK);
@@ -227,7 +227,7 @@ public class PolicyAgentApiImpl implements PolicyAgentApi {
     @Override
     public ResponseEntity<String> getRicsSupportingType(String typeName) {
         try {
-            String url = "/v2/rics?policytype_id=" + typeName;
+            String url = "/a1-policy/v2/rics?policytype_id=" + typeName;
             ResponseEntity<String> rsp = webClient.getForEntity(url).block();
             if (!rsp.getStatusCode().is2xxSuccessful()) {
                 return rsp;

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 deedd8e..1d84de4 100644 (file)
--- 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
@@ -47,7 +47,7 @@ import org.springframework.web.client.HttpServerErrorException;
 import reactor.core.publisher.Mono;
 
 class PolicyAgentApiImplTest {
-    private static final String URL_POLICY_SCHEMAS = "/v2/policy-types";
+    private static final String URL_POLICY_SCHEMAS = "/a1-policy/v2/policy-types";
     private static final String POLICY_TYPE_1_ID = "type1";
     private static final String POLICY_TYPE_1_VALID = "{\"title\":\"type1\"}";
     private static final String POLICY_TYPE_1_INVALID = "\"title\":\"type1\"}";
@@ -122,7 +122,7 @@ class PolicyAgentApiImplTest {
     }
 
     private String urlPolicyInstances(String type) {
-        return "/v2/policies?policytype_id=" + type;
+        return "/a1-policy/v2/policies?policytype_id=" + type;
     }
 
     @Test
@@ -161,11 +161,11 @@ class PolicyAgentApiImplTest {
     }
 
     private String urlPolicyInstance(String id) {
-        return "/v2/policies/" + id;
+        return "/a1-policy/v2/policies/" + id;
     }
 
     private String urlPolicyStatus(String id) {
-        return "/v2/policies/" + id + "/status";
+        return "/a1-policy/v2/policies/" + id + "/status";
     }
 
     @Test
@@ -180,7 +180,7 @@ class PolicyAgentApiImplTest {
     }
 
     private String urlPutPolicy() {
-        return "/v2/policies/";
+        return "/a1-policy/v2/policies/";
     }
 
     private void whenPutReturnOK(String url, String putBody, HttpStatus status, String body) {
@@ -248,7 +248,7 @@ class PolicyAgentApiImplTest {
     }
 
     private String deletePolicyUrl(String id) {
-        return "/v2/policies/" + id;
+        return "/a1-policy/v2/policies/" + id;
     }
 
     @Test
@@ -270,7 +270,7 @@ class PolicyAgentApiImplTest {
     }
 
     private String urlRicInfo(String typeName) {
-        return "/v2/rics?policytype_id=" + typeName;
+        return "/a1-policy/v2/rics?policytype_id=" + typeName;
     }
 
     @Test

diff --git a/webapp-frontend/nginx.conf b/webapp-frontend/nginx.conf
index 8ae7bd8..701d8fa 100644 (file)
--- a/webapp-frontend/nginx.conf
+++ b/webapp-frontend/nginx.conf
@@ -12,7 +12,7 @@ http {
         server_name localhost;
         root /usr/share/nginx/html;
         index index.html;
-        location /v2/ {
+        location /a1-policy/v2/ {
             proxy_pass  http://backend;
         }
         location / {

diff --git a/webapp-frontend/src/app/interceptor.mock.ts b/webapp-frontend/src/app/interceptor.mock.ts
index 25439ae..de521ca 100644 (file)
--- a/webapp-frontend/src/app/interceptor.mock.ts
+++ b/webapp-frontend/src/app/interceptor.mock.ts
@@ -36,59 +36,59 @@ import * as rics from './mock/rics.json';
 
 const urls = [
     {
-        url: 'v2/policy-types',
+        url: 'a1-policy/v2/policy-types',
         json: policytypesList
     },
     {
-        url: 'v2/policy-types/',
+        url: 'a1-policy/v2/policy-types/',
         json: policytypes1
     },
     {
-        url: 'v2/policy-types/1',
+        url: 'a1-policy/v2/policy-types/1',
         json: policytypes1
     },
     {
-        url: 'v2/policies?policytype_id=',
+        url: 'a1-policy/v2/policies?policytype_id=',
         json: policies
     },
     {
-        url: 'v2/policies?policytype_id=1',
+        url: 'a1-policy/v2/policies?policytype_id=1',
         json: policies
     },
     {
-        url: 'v2/policies/2000',
+        url: 'a1-policy/v2/policies/2000',
         json: policyinstances1
     },
     {
-        url: 'v2/policies/2100',
+        url: 'a1-policy/v2/policies/2100',
         json: policyinstances2
     },
     {
-        url: 'v2/policies/2000/status',
+        url: 'a1-policy/v2/policies/2000/status',
         json: policyinstances1Status
     },
     {
-        url: 'v2/policies/2100/status',
+        url: 'a1-policy/v2/policies/2100/status',
         json: policyinstances2Status
     },
     {
-        url: 'v2/policies/2000?type=',
+        url: 'a1-policy/v2/policies/2000?type=',
         json: policyinstanceedit
     },
     {
-        url: 'v2/policies/2100?type=',
+        url: 'a1-policy/v2/policies/2100?type=',
         json: policyinstanceedit
     },
     {
-        url: 'v2/policies/2000?type=1',
+        url: 'a1-policy/v2/policies/2000?type=1',
         json: policyinstanceedit
     },
     {
-        url: 'v2/policies/2100?type=1',
+        url: 'a1-policy/v2/policies/2100?type=1',
         json: policyinstanceedit
     },
     {
-        url: 'v2/policies/2000?ric=ric1&type=1',
+        url: 'a1-policy/v2/policies/2000?ric=ric1&type=1',
         json: ''
     },
     {

diff --git a/webapp-frontend/src/app/services/policy/policy.service.spec.ts b/webapp-frontend/src/app/services/policy/policy.service.spec.ts
index 3e366da..2298d49 100644 (file)
--- a/webapp-frontend/src/app/services/policy/policy.service.spec.ts
+++ b/webapp-frontend/src/app/services/policy/policy.service.spec.ts
@@ -25,7 +25,7 @@ import { PolicyInstance, PolicyInstances, PolicyTypes } from '../../interfaces/p
 
 describe('PolicyService', () => {
   let apiVersion2 = 'v2'
-  let basePath = '';
+  let basePath = '/a1-policy/';
   let policyService: PolicyService;
   let httpTestingController: HttpTestingController;
   beforeEach(() => TestBed.configureTestingModule({

diff --git a/webapp-frontend/src/app/services/policy/policy.service.ts b/webapp-frontend/src/app/services/policy/policy.service.ts
index 482fe87..dc71a83 100644 (file)
--- a/webapp-frontend/src/app/services/policy/policy.service.ts
+++ b/webapp-frontend/src/app/services/policy/policy.service.ts
@@ -34,7 +34,7 @@ import { ControlpanelSuccessTransport } from '../../interfaces/controlpanel.type
 export class PolicyService {
 
     private apiVersion2 = 'v2'
-    private basePath = '';
+    private basePath = '/a1-policy/';
     policyTypesPath = 'policy-types';
     policyPath = 'policies';