Merge "Update baseUrl of pms_v2.0"

diff --combined webapp-frontend/src/app/services/policy/policy.service.spec.ts
index b451823,2298d49..d37bb21
--- 1/webapp-frontend/src/app/services/policy/policy.service.spec.ts
--- 2/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 +25,7 @@@ import { PolicyInstance, PolicyInstance
  
  describe('PolicyService', () => {
    let apiVersion2 = 'v2'
-   let basePath = '';
+   let basePath = '/a1-policy/';
    let policyService: PolicyService;
    let httpTestingController: HttpTestingController;
    beforeEach(() => TestBed.configureTestingModule({
@@@ -59,6 -59,7 +59,6 @@@
          policytypes => expect(policytypes).toEqual(expectedPolicytypes, 'should return expected PolicyTypes'),
          fail
        );
 -
        const req = httpTestingController.expectOne(basePath + apiVersion2 + '/' + policyService.policyTypesPath);
        expect(req.request.method).toEqual('GET');