Merge changes I5c90f5bc,I8883de54
authorIttay Stern <ittay.stern@att.com>
Thu, 24 Oct 2019 10:29:06 +0000 (10:29 +0000)
committerGerrit Code Review <gerrit@onap.org>
Thu, 24 Oct 2019 10:29:06 +0000 (10:29 +0000)
* changes:
  fix ApacheClientMetricInterceptor to return expected ResponseCode
  don't add request id to MDC in VidLoggerAspect

27 files changed:
vid-webpack-master/cypress/integration/iFrames/ala-carte.e2e.ts
vid-webpack-master/cypress/integration/iFrames/auditInfo.modal.e2e.ts
vid-webpack-master/cypress/integration/iFrames/browse-sdc.e2e.ts
vid-webpack-master/cypress/integration/iFrames/changeManagement.e2e.ts
vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts
vid-webpack-master/cypress/integration/iFrames/instantiationStatus.e2e.ts
vid-webpack-master/cypress/integration/iFrames/network.popup.e2e.ts
vid-webpack-master/cypress/integration/iFrames/permission.e2e.ts
vid-webpack-master/cypress/integration/iFrames/resume.e2e.ts
vid-webpack-master/cypress/integration/iFrames/retry.e2e.ts
vid-webpack-master/cypress/integration/iFrames/searchExistingInstance.e2e.ts
vid-webpack-master/cypress/integration/iFrames/service.popup.e2e.ts
vid-webpack-master/cypress/integration/iFrames/serviceWithNetwork.e2e.ts
vid-webpack-master/cypress/integration/iFrames/serviceWithVnfNetwork.e2e.ts
vid-webpack-master/cypress/integration/iFrames/softDeleteAndResume.e2e.ts
vid-webpack-master/cypress/integration/iFrames/viewEdit.e2e.ts
vid-webpack-master/cypress/integration/iFrames/viewOnlyDrawingBoard.e2e.ts
vid-webpack-master/cypress/integration/iFrames/vnf.popup.e2e.ts
vid-webpack-master/cypress/integration/iFrames/vnf.update.e2e.ts
vid-webpack-master/cypress/integration/iFrames/vnfGroups.e2e.ts
vid-webpack-master/cypress/integration/iFrames/welcomePage.e2e.ts
vid-webpack-master/cypress/integration/shared/error.message.popup.e2e.ts
vid-webpack-master/cypress/integration/shared/spinner.e2e.ts
vid-webpack-master/cypress/support/application/application.session.actions.ts
vid-webpack-master/cypress/support/jsonBuilders/mocks/aai.mock.ts
vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/get_vnf_data.json [new file with mode: 0644]
vid-webpack-master/cypress/support/jsonBuilders/mocks/vid.mock.ts

index 3e90e2b..790fcfc 100644 (file)
@@ -33,7 +33,7 @@ describe('A la carte', function () {
 
 
     it(`service name should be mandatory : serviceEcompNaming = true`, ()=> {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/basicService.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/basicService.json').then((res) => {
         jsonBuilderAAIService.basicJson(res,
           Cypress.config('baseUrl') + '/rest/models/services/' + SERVICE_ID,
           200,
@@ -51,7 +51,7 @@ describe('A la carte', function () {
       const rollbackOnFailure : string = "true";
       const projectName : string = "WATKINS";
       const instanceName : string = "serviceInstanceName";
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
 
         cy.setTestApiParamToGR();
         res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].service.vidNotions.instantiationType = 'ALaCarte';
@@ -94,7 +94,7 @@ describe('A la carte', function () {
 
 
     it(`VNF a-la-carte`, ()=> {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         cy.setTestApiParamToGR();
         res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].service.vidNotions.instantiationType = 'ALaCarte';
         res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].service.inputs = null;
@@ -145,7 +145,7 @@ describe('A la carte', function () {
     });
 
     it(`Network a-la-carte`, ()=> {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         cy.setTestApiParamToGR();
         res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].service.vidNotions.instantiationType = 'ALaCarte';
         res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].service.inputs = null;
@@ -199,7 +199,7 @@ describe('A la carte', function () {
       if (new Date() < timeBomb) {
         return;
       }
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         cy.setTestApiParamToGR();
         res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].service.vidNotions.instantiationType = 'ALaCarte';
         res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].service.inputs = null;
index f0db2c9..77eca91 100644 (file)
@@ -13,7 +13,7 @@ describe('Audit information modal', function () {
         win.sessionStorage.clear();
         cy.setReduxState();
         cy.preventErrorsOnLoading();
-        jsonBuilderInstantiationBuilder.basicMock('/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json',
+        jsonBuilderInstantiationBuilder.basicMock('cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json',
           Cypress.config('baseUrl') + "/asyncInstantiation**");
         cy.initAAIMock();
         cy.initVidMock();
index e787aa7..ff43936 100644 (file)
@@ -29,7 +29,7 @@ describe('Browse SDC', function () {
       const MACRO_FOR_NEW_FLOW_ID: string = '74fa72dd-012b-49c3-800d-06b12bcaf1a0';
       const CANCEL_BUTTON = "cancelButton";
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/bug616888/list-services.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/bug616888/list-services.json').then((res) => {
         jsonBuilderAndMock.basicJson(res,
           Cypress.config('baseUrl') + '/rest/models/services?distributionStatus=DISTRIBUTED',
           200,
@@ -37,7 +37,7 @@ describe('Browse SDC', function () {
           'list_services');
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/bug616888/service-with-configuration.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/bug616888/service-with-configuration.json').then((res) => {
         jsonBuilderAndMock.basicJson(res,
           Cypress.config('baseUrl') + '/rest/models/services/' + MACRO_WITH_NETWORK_ID,
           200,
@@ -45,7 +45,7 @@ describe('Browse SDC', function () {
           'MACRO_WITH_CONFIGURATION');
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro1.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro1.json').then((res) => {
         jsonBuilderAndMock.basicJson(res,
           Cypress.config('baseUrl') + '/rest/models/services/' + MACRO_FOR_NEW_FLOW_ID,
           200,
@@ -67,7 +67,7 @@ describe('Browse SDC', function () {
 
   it(`browse sdc of service without instantiationType open aLaCarte popup`, function () {
     const VERY_OLD_SERVICE_UUID: string = "09c476c7-91ae-44b8-a731-04d8d8fa3695";
-    const TEST_MOCKS_PATH="/cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/";
+    const TEST_MOCKS_PATH="cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/";
 
     const CANCEL_BUTTON = "cancelButton";
 
index b5a01be..219ffad 100644 (file)
@@ -4,15 +4,17 @@ import {JsonBuilder} from "../../support/jsonBuilders/jsonBuilder";
 import {AAISubDetailsModel} from "../../support/jsonBuilders/models/aaiSubDetails.model";
 
 describe('Change management AKA VNF changes', function () {
-  var jsonBuilderAAISubDetailsModel: JsonBuilder<AAISubDetailsModel> = new JsonBuilder<AAISubDetailsModel>();
+  let jsonBuilderAAISubDetailsModel: JsonBuilder<AAISubDetailsModel> = new JsonBuilder<AAISubDetailsModel>();
+  let jsonBuilderVnfData: JsonBuilder<any> = new JsonBuilder<any>();
 
+  let aaiGetVNFDataUrl = Cypress.config('baseUrl') + "/get_vnf_data_by_globalid_and_service_type/e433710f-9217-458d-a79d-1c7aff376d89/TYLER SILVIA";
   //describe('Contact us', () => {
 
   beforeEach(() => {
     cy.login();
     cy.initAAIMock();
 
-    cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubDetailsE2E.json').then((res) => {
+    cy.readFile('cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubDetailsE2E.json').then((res) => {
       jsonBuilderAAISubDetailsModel.basicJson(
         res,
         Cypress.config('baseUrl') + "/aai_sub_details/e433710f-9217-458d-a79d-1c7aff376d89**",
@@ -21,19 +23,104 @@ describe('Change management AKA VNF changes', function () {
         "aai-sub-details")
     });
 
+    cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/flags.json').then(() => {
+      cy.server()
+        .route({
+          method: 'GET',
+          delay: 0,
+          status: 200,
+          url: Cypress.config('baseUrl') + "/flags**",
+          response: {
+            "FLAG_FLASH_REDUCED_RESPONSE_CHANGEMG": true,
+            "FLAG_FLASH_CLOUD_REGION_AND_NF_ROLE_OPTIONAL_SEARCH": true,
+            "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST": true
+          }
+        }).as('initFlags');
+    });
+
+    cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/get_vnf_data.json').then((res) => {
+      jsonBuilderVnfData.basicJson(
+        res,
+        aaiGetVNFDataUrl + '**',
+        200,
+        0,
+        "aai_get_vnf_data")
+    });
+
+    openNewVnfChangeModal();
+
   });
 
   afterEach(() => {
     cy.screenshot();
   });
 
-  it(`verifying + VNF changes`, function () {
+  function openNewVnfChangeModal() {
     cy.visit('/serviceModels.htm#/change-management');
     cy.getElementByDataTestsId('create-new-change-management').click();
     cy.getElementByDataTestsId('newChangeManagementForm');
+  }
+
+  function fillSubscriberAndServiceType() {
     cy.selectDropdownOptionByText('subscriberName', 'SILVIA ROBBINS');
     cy.selectDropdownOptionByText('serviceType', 'TYLER SILVIA');
+  }
+
+  function fillCloudRegion() {
+    cy.selectDropdownOptionByText('cloudRegion', 'AAIAIC25 (AIC)');
+  }
+
+  function fillNfRole() {
+    cy.getElementByDataTestsId('vnfType').type('vMobileDNS');
+  }
+
+  it(`nf role input and cloud region input and search vnfs button should be disabled  without subscriber and serviceType`, function () {
+    cy.get('#searchVNF').should('be.disabled');
+    cy.getElementByDataTestsId('cloudRegion').should('be.disabled');
+    cy.getElementByDataTestsId('vnfType').should('be.disabled')
+  });
+
+  it(`search vnfs without nf role and cloud region`, function () {
+
+    fillSubscriberAndServiceType();
+
+    cy.get('#searchVNF').click();
+
+    cy.wait('@aai_get_vnf_data')
+      .its('url').should('equal', aaiGetVNFDataUrl)
+  });
+
+
+  it(`search vnfs by nf role and cloud region`, function () {
+
+    fillSubscriberAndServiceType();
+    fillNfRole();
+    fillCloudRegion();
+
+    cy.get('#searchVNF').click();
+
+    cy.wait('@aai_get_vnf_data')
+      .its('url').should('equal', aaiGetVNFDataUrl + "?cloudRegion=AAIAIC25&nfRole=vMobileDNS")
   });
-});
 
 
+  it(`search vnfs by cloud region`, function () {
+
+    fillSubscriberAndServiceType();
+    fillCloudRegion();
+    cy.get('#searchVNF').click();
+
+    cy.wait('@aai_get_vnf_data')
+      .its('url').should('equal', aaiGetVNFDataUrl + "?cloudRegion=AAIAIC25")
+  });
+
+  it(`search vnfs by nf role`, function () {
+
+    fillSubscriberAndServiceType();
+    fillNfRole();
+    cy.get('#searchVNF').click();
+
+    cy.wait('@aai_get_vnf_data')
+      .its('url').should('equal', aaiGetVNFDataUrl + "?nfRole=vMobileDNS")
+  });
+});
index e150b93..a9cddfc 100644 (file)
@@ -22,7 +22,7 @@ describe('Drawing board', function () {
   describe('duplicate', () => {
 
     it('delete vf module reduce the number of vf modules ', function () {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
         cy.drawingBoardPressAddButtonByElementName('node-2017-488_PASQUALE-vPE 0').get('i').should('have.class', 'fa-plus-circle');
@@ -40,7 +40,7 @@ describe('Drawing board', function () {
     });
 
     it('create new  vf module  update the number of vf modules ', () => {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
         cy.drawingBoardPressAddButtonByElementName('node-2017-488_PASQUALE-vPE 0').get('i').should('have.class', 'fa-plus-circle');
@@ -58,7 +58,7 @@ describe('Drawing board', function () {
     });
 
     it('duplicate vnf multi - should update number of vf modules on left side and disable duplicate when created max', () => {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
         cy.drawingBoardPressAddButtonByElementName('node-2017-488_PASQUALE-vPE 0').get('i').should('have.class', 'fa-plus-circle')
@@ -267,7 +267,7 @@ describe('Drawing board', function () {
     });
 
     xit('should display service model name', () => {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
         cy.get('#service-model-name').contains('action-data');
@@ -275,7 +275,7 @@ describe('Drawing board', function () {
     });
 
     it('should display icon and message if no vnf and vnfModules', () => {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         res.global.drawingBoardStatus = "CREATE";
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
@@ -290,7 +290,7 @@ describe('Drawing board', function () {
     });
 
     it('should show alert on remove vnf with modules', () => {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json').then((res) => {
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
         cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-69e09f68-8b63-4cc9-b9ff-860960b5db09-2017-488_PASQUALE-vPE 0');
@@ -309,7 +309,7 @@ describe('Drawing board', function () {
     });
 
     it('should not show alert on remove vnf without modules', () => {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json').then((res) => {
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
         cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-0903e1c0-8e03-4936-b5c2-260653b96413-2017-388_PASQUALE-vPE 1');
@@ -318,7 +318,7 @@ describe('Drawing board', function () {
     });
 
     it('should show <Automatically Assigned> if ecomp is true', () => {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
         cy.drawingBoardPressAddButtonByElementName('node-2017-388_PASQUALE-vPE 0').click({force: true});
@@ -338,7 +338,7 @@ describe('Drawing board', function () {
     it('should show model name if ecomp is false', () => {
       const vnfModelKey: string = '2017-488_PASQUALE-vPE 0',
         vnfModelName: string = '2017-488_PASQUALE-vPE';
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs[vnfModelKey].properties.ecomp_generated_naming = 'false';
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
@@ -358,7 +358,7 @@ describe('Drawing board', function () {
     describe('add instance open a popup', () => {
 
       it('should add vfModule with popup with empty required instance name', () => {
-        cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json').then((res) => {
+        cy.readFile('cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json').then((res) => {
           res.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_PASQUALE-vPE 0"].properties.ecomp_generated_naming = "false";
           res.service.serviceInstance["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_PASQUALE-vPE 0"].vfModules = [];
           cy.setReduxState(<any>res);
@@ -369,7 +369,7 @@ describe('Drawing board', function () {
       });
 
       it('should add vfModule with popup if empty required dynamic input', () => {
-        cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json').then((res) => {
+        cy.readFile('cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json').then((res) => {
           res.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_PASQUALE-vPE 0"].vfModules["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_vRE_BV..module-1"].inputs["pasqualevpe0_bandwidth"].default = '';
           res.service.serviceInstance["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_PASQUALE-vPE 0"].vfModules = [];
           cy.setReduxState(<any>res);
@@ -385,7 +385,7 @@ describe('Drawing board', function () {
 
     describe('show warning and disable deploy button on vnf missing data', () => {
       it('show warning on vnf, and disable button, remove warning and enable button after edit', () => {
-        cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json').then((res) => {
+        cy.readFile('cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json').then((res) => {
           res.service.serviceInstance['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].existingVNFCounterMap['0903e1c0-8e03-4936-b5c2-260653b96413'] = 1;
           res.service.serviceInstance["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].validationCounter = 1;
           res.service.serviceInstance["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-388_PASQUALE-vPE 1"] = {
@@ -426,7 +426,7 @@ describe('Drawing board', function () {
     describe('vnf should automatically displayed or not according its min value and its vf-modules min value', () => {
 
       it('vnf with min_instances value > 0 without required VF modules, should be created automatically without children', () => {
-        cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/basicRedux.json').then((res) => {
+        cy.readFile('cypress/support/jsonBuilders/mocks/jsons/basicRedux.json').then((res) => {
           res.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_PASQUALE-vPE 0"].properties['min_instances'] = 1;
           res.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_PASQUALE-vPE 0"].vfModules["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"].properties['initialCount'] = 0;
           res.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vfModules["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"].properties['initialCount'] = 0;
@@ -445,7 +445,7 @@ describe('Drawing board', function () {
       });
 
       it('vnf with min_instances value > 1 with required VF modules, should be created automatically with children only once', () => {
-        cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/basicRedux.json').then((res) => {
+        cy.readFile('cypress/support/jsonBuilders/mocks/jsons/basicRedux.json').then((res) => {
           res.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_PASQUALE-vPE 0"].properties['min_instances'] = 3;
           cy.setReduxState(<any>res);
           cy.fillServicePopup().then(() => {
@@ -461,7 +461,7 @@ describe('Drawing board', function () {
 
 
       it('vnf with min_instances value = 0 with required VF modules should be created automatically with its children', () => {
-        cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/basicRedux.json').then((res) => {
+        cy.readFile('cypress/support/jsonBuilders/mocks/jsons/basicRedux.json').then((res) => {
           res.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].vnfs["2017-488_PASQUALE-vPE 0"].properties['min_instances'] = 0;
           cy.setReduxState(<any>res);
           cy.fillServicePopup().then(() => {
@@ -478,7 +478,7 @@ describe('Drawing board', function () {
 
 
       it('vnf without min_instances and without required VF modules, should not exist automatically in right side', () => {
-        cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/basicRedux.json').then((res) => {
+        cy.readFile('cypress/support/jsonBuilders/mocks/jsons/basicRedux.json').then((res) => {
           cy.setReduxState(<any>res);
           cy.fillServicePopup().then(() => {
             cy.visit("welcome.htm").then(() => {
index b358ad2..90dbcdd 100644 (file)
@@ -16,7 +16,7 @@ describe('Instantiation status', function () {
       cy.preventErrorsOnLoading();
       cy.initAAIMock();
       cy.initVidMock();
-      jsonBuilderInstantiationBuilder.basicMock('/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json',
+      jsonBuilderInstantiationBuilder.basicMock('cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json',
         Cypress.config('baseUrl') + "/asyncInstantiation**",
         (res: any) => {
             asyncRes = res;
@@ -90,5 +90,5 @@ describe('Instantiation status', function () {
         cy.get('.dropdown-menu').find('.disabled').find(`[data-tests-id='context-menu-hide']`).should('not.exist');
         cy.get('.dropdown-menu').find('.disabled').find(`[data-tests-id='context-menu-audit-info']`).should('not.exist');
   });
-  
+
 });
index ec471ae..387f347 100644 (file)
@@ -148,7 +148,7 @@ describe('Network popup', function () {
       const SERVICE_INSTANCE_ID: string = "f8791436-8d55-4fde-b4d5-72dd2cf13cfb";
       const SERVICE_MODEL_ID: string = '6b528779-44a3-4472-bdff-9cd15ec93450';
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/basicNetworkModel.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/basicNetworkModel.json').then((res) => {
         jsonBuilderAndMock.basicJson(res,
           Cypress.config('baseUrl') + '/rest/models/services/6b528779-44a3-4472-bdff-9cd15ec93450',
           200,
@@ -156,7 +156,7 @@ describe('Network popup', function () {
           'initServiceModel');
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/basicNetworkInstance.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/basicNetworkInstance.json').then((res) => {
         jsonBuilderAndMock.basicJson(
           res,
           Cypress.config('baseUrl') + "/aai_get_service_instance_topology/e433710f-9217-458d-a79d-1c7aff376d89/TYLER SILVIA/f8791436-8d55-4fde-b4d5-72dd2cf13cfb",
index 97be48c..f14bc1b 100644 (file)
@@ -29,7 +29,7 @@ describe('Permissions ',  ()=> {
 
     cy.initDrawingBoardUserPermission(<any>{isEditPermitted : false});
 
-    cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json').then((res) => {
+    cy.readFile('cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json').then((res) => {
       jsonBuilderAndMock.basicJson(
         res,
         Cypress.config('baseUrl') + "/rest/models/services/6b528779-44a3-4472-bdff-9cd15ec93450",
@@ -61,7 +61,7 @@ describe('Permissions ',  ()=> {
 
     cy.initDrawingBoardUserPermission();
 
-    cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json').then((res) => {
+    cy.readFile('cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json').then((res) => {
       jsonBuilderAndMock.basicJson(
         res,
         Cypress.config('baseUrl') + "/rest/models/services/6b528779-44a3-4472-bdff-9cd15ec93450",
index cec915a..5857e1a 100644 (file)
@@ -13,7 +13,7 @@ describe('Resume tests', function () {
     let jsonBuilderAAISubDetailsModel: JsonBuilder<AAISubDetailsModel> = new JsonBuilder<AAISubDetailsModel>();
     let jsonBuilderAaiServiceInstances: JsonBuilder<AaiServiceInstancesModel> = new JsonBuilder<AaiServiceInstancesModel>();
     beforeEach(() => {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/defect710619/serviceE2E.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/defect710619/serviceE2E.json').then((res) => {
         jsonBuilderAAIService.basicJson(
           res,
           Cypress.config('baseUrl') + "/rest/models/services/**",
@@ -22,7 +22,7 @@ describe('Resume tests', function () {
       });
 
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubViewEditForServiceWithSomeVFModuleE2E.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubViewEditForServiceWithSomeVFModuleE2E.json').then((res) => {
         jsonBuilderAAISubViewEditModel.basicJson(
           res,
           Cypress.config('baseUrl') + "/aai_sub_viewedit/**",
@@ -31,7 +31,7 @@ describe('Resume tests', function () {
           "aai-sub-view-edit")
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubDetailsE2E.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiSubDetailsE2E.json').then((res) => {
         jsonBuilderAAISubDetailsModel.basicJson(
           res,
           Cypress.config('baseUrl') + "/aai_sub_details/**",
@@ -40,7 +40,7 @@ describe('Resume tests', function () {
           "aai-sub-details")
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiServiceInstancesE2E.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/defect710619/aaiServiceInstancesE2E.json').then((res) => {
         jsonBuilderAaiServiceInstances.basicJson(
           res,
           Cypress.config('baseUrl') + "/search_service_instances**",
@@ -76,7 +76,7 @@ describe('Resume tests', function () {
 
     it(`Resume Defect 710619 - with flag FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE is OFF`, function () {
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/flags.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/flags.json').then((res) => {
         cy.server()
           .route({
             method: 'GET',
@@ -108,7 +108,7 @@ describe('Resume tests', function () {
           .getElementByDataTestsId('tenant').should('be.visible').select("bae71557c5bb4d5aac6743a4e5f1d054");
         cy.getElementByDataTestsId('confirmResumeDeleteButton').not('.button--inactive').click().then(()=> {
             cy.wait('@actualResumeCall').then(xhr => {
-              cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/defect710619/expectedResumeWithVGResults.json').then((expectedResult) => {
+              cy.readFile('cypress/support/jsonBuilders/mocks/jsons/defect710619/expectedResumeWithVGResults.json').then((expectedResult) => {
                 cy.deepCompare(xhr.request.body, expectedResult);
               });
             });
index 683e1d9..60c07f4 100644 (file)
@@ -10,7 +10,7 @@ describe('Retry Page', function () {
       win.sessionStorage.clear();
       cy.preventErrorsOnLoading();
       cy.initAAIMock();
-      jsonBuilderAndMock.basicMock('/cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json',
+      jsonBuilderAndMock.basicMock('cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json',
         Cypress.config('baseUrl') + "/rest/models/services/6b528779-44a3-4472-bdff-9cd15ec93450");
       cy.initVidMock();
       cy.initZones();
@@ -115,7 +115,7 @@ describe('Retry Page', function () {
       res.vnfs["2017-488_PASQUALE-vPE 0"].vfModules["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"]["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot"].isFailed = true;
       res.vnfs["2017-488_PASQUALE-vPE 0"].vfModules["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0"]["2017488_pasqualevpe0..2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0uvfot"].action = 'Create';
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/responceForFailedInstance.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/responceForFailedInstance.json').then((res) => {
         jsonBuilderAndMock.basicJson(
           res,
           Cypress.config('baseUrl') + "/asyncInstantiation/auditStatusForRetry**",
index 0e68930..2617354 100644 (file)
@@ -62,7 +62,7 @@ describe('search existing instance', function () {
         response: searchServiceInstancesResponse
       }).as('search_service_instances');
 
-    cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/serviceModels/serviceForNewViewEdit.json').then((res) => {
+    cy.readFile('cypress/support/jsonBuilders/mocks/jsons/serviceModels/serviceForNewViewEdit.json').then((res) => {
       jsonBuilderAndMock.basicJson(
         res,
         Cypress.config('baseUrl') + `/rest/models/services/${SERVICE_MODEL_VERSION_ID}`,
index 4af4a14..d95cfdb 100644 (file)
@@ -18,7 +18,7 @@ describe('Service popup', function () {
     });
 
     it('a-la-carte service instantiation popup has all required fields ', function () {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res1) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res1) => {
         res1.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].service.vidNotions.instantiationType = 'ALaCarte';
         cy.setReduxState(<any>res1);
         cy.openIframe('/app/ui/#/servicePopup?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd&isCreate=true');
@@ -33,7 +33,7 @@ describe('Service popup', function () {
     });
 
     it('a-la-carte service instantiation popup has Instance name as required', function () {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res1) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res1) => {
         res1.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].service.vidNotions.instantiationType = 'ALaCarte';
         let isEcompNaming = false;
         res1.service.serviceHierarchy["2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd"].service.serviceEcompNaming = isEcompNaming.toString();
@@ -75,7 +75,7 @@ describe('Service popup', function () {
 
     it('should display error when api return empty data', function () {
       cy.initCategoryParameter(<any>{});
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res1) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res1) => {
         res1.service.categoryParameters.owningEntityList = [];
         cy.setReduxState(<any>res1);
         cy.openIframe('/app/ui/#/servicePopup?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd&isCreate=true');
index 8e297d0..19a3be9 100644 (file)
@@ -9,7 +9,7 @@ import {AAISubViewEditModel} from '../../support/jsonBuilders/models/aaiSubViewE
 describe('View Edit Page', function () {
   describe('test view service with network', () => {
     var jsonBuilderAAIService : JsonBuilder<ServiceModel> = new JsonBuilder<ServiceModel>();
-    const presetsPrefix : string = '/cypress/support/jsonBuilders/mocks/jsons/';
+    const presetsPrefix : string = 'cypress/support/jsonBuilders/mocks/jsons/';
 
     var jsonBuilderAAISubViewEditModel: JsonBuilder<AAISubViewEditModel> = new JsonBuilder<AAISubViewEditModel>();
     var jsonBuilderAAISubDetailsModel: JsonBuilder<AAISubDetailsModel> = new JsonBuilder<AAISubDetailsModel>();
index a1af531..24ddc9b 100644 (file)
@@ -17,7 +17,7 @@ describe('Service With VNF network', function () {
     var jsonBuilderAaiServiceInstances: JsonBuilder<AaiServiceInstancesModel> = new JsonBuilder<AaiServiceInstancesModel>();
     var jsonBuilderEmpty: JsonBuilder<Object> = new JsonBuilder<Object>();
     beforeEach(() => {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/basicService.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/basicService.json').then((res) => {
         jsonBuilderAAIService.basicJson(
           res,
           Cypress.config('baseUrl') + "/rest/models/services/6e59c5de-f052-46fa-aa7e-2fca9d674c44",
@@ -27,7 +27,7 @@ describe('Service With VNF network', function () {
       });
 
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForComplexService.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForComplexService.json').then((res) => {
         jsonBuilderAAISubViewEditModel.basicJson(
           res,
           Cypress.config('baseUrl') + "/aai_sub_viewedit/**/**/**/3f93c7cb-2fd0-4557-9514-e189b7b04f9d",
@@ -36,7 +36,7 @@ describe('Service With VNF network', function () {
           "aai-sub-view-edit")
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/aaiSubDetails.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/aaiSubDetails.json').then((res) => {
         jsonBuilderAAISubDetailsModel.basicJson(
           res,
           Cypress.config('baseUrl') + "/aai_sub_details/**",
@@ -45,7 +45,7 @@ describe('Service With VNF network', function () {
           "aai-sub-details")
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/aaiServiceInstances.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/aaiServiceInstances.json').then((res) => {
         jsonBuilderAaiServiceInstances.basicJson(
           res,
           Cypress.config('baseUrl') + "/search_service_instances**",
index b83268e..fccdd53 100644 (file)
@@ -13,7 +13,7 @@ describe('Soft delete tests', function () {
     var jsonBuilderAAISubDetailsModel: JsonBuilder<AAISubDetailsModel> = new JsonBuilder<AAISubDetailsModel>();
     var jsonBuilderAaiServiceInstances: JsonBuilder<AaiServiceInstancesModel> = new JsonBuilder<AaiServiceInstancesModel>();
     beforeEach(() => {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/basicService.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/basicService.json').then((res) => {
         jsonBuilderAAIService.basicJson(
           res,
           Cypress.config('baseUrl') + "/rest/models/services/6e59c5de-f052-46fa-aa7e-2fca9d674c44",
@@ -23,7 +23,7 @@ describe('Soft delete tests', function () {
       });
 
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForServiceWithSomeVFModule.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForServiceWithSomeVFModule.json').then((res) => {
         jsonBuilderAAISubViewEditModel.basicJson(
           res,
           Cypress.config('baseUrl') + "/aai_sub_viewedit/**/**/**/3f93c7cb-2fd0-4557-9514-e189b7b04f9d",
@@ -32,7 +32,7 @@ describe('Soft delete tests', function () {
           "aai-sub-view-edit")
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/aaiSubDetails.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/aaiSubDetails.json').then((res) => {
         jsonBuilderAAISubDetailsModel.basicJson(
           res,
           Cypress.config('baseUrl') + "/aai_sub_details/**",
@@ -41,7 +41,7 @@ describe('Soft delete tests', function () {
           "aai-sub-details")
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/aaiServiceInstances.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/aaiServiceInstances.json').then((res) => {
         jsonBuilderAaiServiceInstances.basicJson(
           res,
           Cypress.config('baseUrl') + "/search_service_instances**",
@@ -75,7 +75,7 @@ describe('Soft delete tests', function () {
 
     it(`Resume button display in orch status - pendingactivation, assigned - feature FLAG_VF_MODULE_RESUME_STATUS_CREATE - is OFF`, function () {
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/flags.json').then(() => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/flags.json').then(() => {
         cy.server()
           .route({
             method: 'GET',
@@ -136,7 +136,7 @@ describe('Soft delete tests', function () {
 
     it(`Soft delete button display with partial homing data from AAI`, function () {
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/aaiGetHomingData.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/aaiGetHomingData.json').then((res) => {
         jsonBuilderAaiServiceInstances.basicJson(
           res,
           Cypress.config('baseUrl') + "/aai_get_homing_by_vfmodule/c015cc0f-0f37-4488-aabf-53795fd93cd3/a231a99c-7e75-4d6d-a0fb-5c7d26f30f77",
index abbe112..fc568c0 100644 (file)
@@ -23,7 +23,7 @@ describe('View Edit Page', function () {
       cy.window().then((win) => {
         win.sessionStorage.clear();
       });
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/basicService.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/basicService.json').then((res) => {
         jsonBuilderAAIService.basicJson(
           res,
           Cypress.config('baseUrl') + "/rest/models/services/" + commonUuid,
@@ -32,7 +32,7 @@ describe('View Edit Page', function () {
           changeServiceModel)
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/basicFabricConfigService.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/basicFabricConfigService.json').then((res) => {
         jsonBuilderAAIService.basicJson(
           res,
           Cypress.config('baseUrl') + "/rest/models/services/6e59c5de-f052-46fa-aa7e-2fca9d671234",
@@ -40,7 +40,7 @@ describe('View Edit Page', function () {
           "service-FabricConfig", changeFabric)
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/activeFabricConfigService.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/activeFabricConfigService.json').then((res) => {
         jsonBuilderAAIService.basicJson(
           res,
           Cypress.config('baseUrl') + "/rest/models/services/6e59c5de-f052-46fa-aa7e-2fca9d675678",
@@ -48,7 +48,7 @@ describe('View Edit Page', function () {
           "service-FabricConfig", changeFabric)
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/createdFabricConfigService.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/createdFabricConfigService.json').then((res) => {
         jsonBuilderAAIService.basicJson(
           res,
           Cypress.config('baseUrl') + "/rest/models/services/6e59c5de-f052-46fa-aa7e-2fca9d679000",
@@ -56,7 +56,7 @@ describe('View Edit Page', function () {
           "service-FabricConfig", changeFabric)
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/deactivatedFabricConfigService.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/deactivatedFabricConfigService.json').then((res) => {
         jsonBuilderAAIService.basicJson(
           res,
           Cypress.config('baseUrl') + "/rest/models/services/6e59c5de-f052-46fa-aa7e-2fca9d671000",
@@ -64,7 +64,7 @@ describe('View Edit Page', function () {
           "service-FabricConfig", changeFabric)
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForComplexService.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForComplexService.json').then((res) => {
         jsonBuilderAAISubViewEditModel.basicJson(
           res,
           Cypress.config('baseUrl') + "/aai_sub_viewedit/**/**/**/3f93c7cb-2fd0-4557-9514-e189b7b04f9d",
@@ -73,7 +73,7 @@ describe('View Edit Page', function () {
           "aai-sub-view-edit")
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForFabricConfigService.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForFabricConfigService.json').then((res) => {
         jsonBuilderAAISubViewEditModel.basicJson(
           res,
           Cypress.config('baseUrl') + "/aai_sub_viewedit/**/**/**/c187e9fe-40c3-4862-b73e-84ff056205f61234",
@@ -82,7 +82,7 @@ describe('View Edit Page', function () {
           "aai-sub-view-edit")
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForActiveFabricConfigService.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForActiveFabricConfigService.json').then((res) => {
         jsonBuilderAAISubViewEditModel.basicJson(
           res,
           Cypress.config('baseUrl') + "/aai_sub_viewedit/**/**/**/c187e9fe-40c3-4862-b73e-84ff056205f65678",
@@ -91,7 +91,7 @@ describe('View Edit Page', function () {
           "aai-sub-view-edit")
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForCreatedFabricConfigService.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForCreatedFabricConfigService.json').then((res) => {
         jsonBuilderAAISubViewEditModel.basicJson(
           res,
           Cypress.config('baseUrl') + "/aai_sub_viewedit/**/**/**/c187e9fe-40c3-4862-b73e-84ff056205f69000",
@@ -100,7 +100,7 @@ describe('View Edit Page', function () {
           "aai-sub-view-edit")
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForDeactivatedFabricConfigService.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForDeactivatedFabricConfigService.json').then((res) => {
         jsonBuilderAAISubViewEditModel.basicJson(
           res,
           Cypress.config('baseUrl') + "/aai_sub_viewedit/**/**/**/c187e9fe-40c3-4862-b73e-84ff056205f61000",
@@ -109,7 +109,7 @@ describe('View Edit Page', function () {
           "aai-sub-view-edit")
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/aaiSubDetails.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/aaiSubDetails.json').then((res) => {
         jsonBuilderAAISubDetailsModel.basicJson(
           res,
           Cypress.config('baseUrl') + "/aai_sub_details/**",
@@ -118,7 +118,7 @@ describe('View Edit Page', function () {
           "aai-sub-details")
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/aaiServiceInstancePnfs.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/aaiServiceInstancePnfs.json').then((res) => {
         jsonBuilderPNF.basicJson(
           res,
           Cypress.config('baseUrl') + "/aai_get_service_instance_pnfs/**",
@@ -127,7 +127,7 @@ describe('View Edit Page', function () {
           "aai-get-service-instance-pnfs")
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/aaiServiceInstances.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/aaiServiceInstances.json').then((res) => {
         jsonBuilderAaiServiceInstances.basicJson(
           res,
           Cypress.config('baseUrl') + "/search_service_instances**",
@@ -136,7 +136,7 @@ describe('View Edit Page', function () {
           "aai-get-service-instances")
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyObjectResponse.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyObjectResponse.json').then((res) => {
         jsonBuilderEmpty.basicJson(
           res,
           Cypress.config('baseUrl') + "/aai_getPortMirroringConfigsData**",
@@ -145,7 +145,7 @@ describe('View Edit Page', function () {
           "aai_getPortMirroringConfigsDate - empty response")
       });
 
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyObjectResponse.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyObjectResponse.json').then((res) => {
         jsonBuilderEmpty.basicJson(
           res,
           Cypress.config('baseUrl') + "/aai_getPortMirroringSourcePorts**",
index fecf959..e5be3fb 100644 (file)
@@ -63,7 +63,7 @@ describe('View only drawing board', function () {
     const SERVICE_INSTANCE_ID: string = "f8791436-8d55-4fde-b4d5-72dd2cf13cfb";
     const SERVICE_MODEL_ID: string = '6b528779-44a3-4472-bdff-9cd15ec93450';
 
-    cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json').then((res) => {
+    cy.readFile('cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json').then((res) => {
       jsonBuilderInstantiationBuilder.basicJson(
         res,
         Cypress.config('baseUrl') + "/rest/models/services/6b528779-44a3-4472-bdff-9cd15ec93450",
@@ -86,7 +86,7 @@ describe('View only drawing board', function () {
     const SERVICE_INSTANCE_ID: string = "f8791436-8d55-4fde-b4d5-72dd2cf13cfb";
     const SERVICE_MODEL_ID: string = '6b528779-44a3-4472-bdff-9cd15ec93450';
 
-    cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json').then((res) => {
+    cy.readFile('cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json').then((res) => {
       jsonBuilderAndMock.basicJson(
         res,
         Cypress.config('baseUrl') + "/rest/models/services/6b528779-44a3-4472-bdff-9cd15ec93450",
index e377d72..2c98500 100644 (file)
@@ -45,7 +45,7 @@ describe('Vnf popup', function () {
     });
 
     it('should display min/max', function () {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs['2017-488_PASQUALE-vPE 0'].properties.min_instances = 100;
         res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs['2017-488_PASQUALE-vPE 0'].properties.max_instances = 200;
         cy.setReduxState(<any>res);
@@ -59,7 +59,7 @@ describe('Vnf popup', function () {
     });
 
     it('should display default values for undefined min/max', function () {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs['2017-488_PASQUALE-vPE 0'].properties.min_instances = null;
         res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs['2017-488_PASQUALE-vPE 0'].properties.max_instances = null;
         cy.setReduxState(<any>res);
@@ -73,7 +73,7 @@ describe('Vnf popup', function () {
      });
 
     it('fill all fields of vnf popup', function () {
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((res) => {
         res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs['2017-488_PASQUALE-vPE 0'].min = null;
         res.service.serviceHierarchy['2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd'].vnfs['2017-488_PASQUALE-vPE 0'].max = null;
         cy.setReduxState(<any>res);
index b1ba769..7c942ea 100644 (file)
@@ -37,7 +37,7 @@ describe('Delete vnf instance', function () {
       response: "[]",
     }).as("expectedPostAsyncInstantiation");
 
-    cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json').then((res) => {
+    cy.readFile('cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json').then((res) => {
       res.service.vidNotions.instantiationType = 'ALaCarte';
       jsonBuilderAndMock.basicJson(
         res,
index f9c188b..cd21f4e 100644 (file)
@@ -81,11 +81,11 @@ describe('Vnf Groups', function () {
           serviceModel = res;
         });
 
-        cy.readFile('./cypress/support/jsonBuilders/mocks/jsons/vnfGroupBasicServiceInstance.json').then((res) => {
+        cy.readFile('cypress/support/jsonBuilders/mocks/jsons/vnfGroupBasicServiceInstance.json').then((res) => {
           basicServiceInstance = res;
         });
 
-        cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((reduxRes) => {
+        cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((reduxRes) => {
 
           reduxRes.service.serviceHierarchy[SERVICE_MODEL_ID] = serviceModel;
           reduxRes.service.serviceInstance[SERVICE_MODEL_ID] = basicServiceInstance;
@@ -137,11 +137,11 @@ describe('Vnf Groups', function () {
           serviceModel = res;
         });
 
-        cy.readFile('./cypress/support/jsonBuilders/mocks/jsons/vnfGroupBasicServiceInstance.json').then((res) => {
+        cy.readFile('cypress/support/jsonBuilders/mocks/jsons/vnfGroupBasicServiceInstance.json').then((res) => {
           basicServiceInstance = res;
         });
 
-        cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((reduxRes) => {
+        cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((reduxRes) => {
 
           reduxRes.service.serviceHierarchy[SERVICE_MODEL_ID] = serviceModel;
           reduxRes.service.serviceInstance[SERVICE_MODEL_ID] = basicServiceInstance;
@@ -696,7 +696,7 @@ describe('Vnf Groups', function () {
           )
         });
 
-        cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((reduxRes) => {
+        cy.readFile('cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json').then((reduxRes) => {
 
           reduxRes.service.serviceHierarchy[SERVICE_MODEL_ID] = serviceModel;
 
index 5b34ee5..5a0b963 100644 (file)
@@ -24,7 +24,7 @@ describe('Welcome page', function () {
   it(`verifying VID version"`, function () {
 
     const APP_VERSION = "1902.1948";
-    cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/version.json').then((res) => {
+    cy.readFile('cypress/support/jsonBuilders/mocks/jsons/version.json').then((res) => {
       jsonBuilderAndMock.basicJson(res,
         Cypress.config('baseUrl') + '/version',
         200,
index 6902113..55f90cc 100644 (file)
@@ -24,7 +24,7 @@ describe('Error message popup', function () {
 
     it('error should display on api error', function () {
       // adding call with delay of 2000 sec
-      cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json').then((res) => {
+      cy.readFile('cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json').then((res) => {
         jsonBuilderInstantiationBuilder.basicJson(res, Cypress.config('baseUrl') + "/asyncInstantiation**", 500,0, "error 500 asyncInstantiation");
 
         cy.openIframe('app/ui/#/instantiationStatus');
index 438e7bc..cd14a12 100644 (file)
@@ -25,7 +25,7 @@ describe('Spinner', function () {
       const timeBomb:Date = new Date(2018,6,10,0,0,0); //month 6 is July
       if (new Date(Date.now()) > timeBomb) {
 
-        cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json').then((res) => {
+        cy.readFile('cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json').then((res) => {
 
           jsonBuilderInstantiationBuilder.basicJson(res,
             Cypress.config('baseUrl') + "/asyncInstantiation**",
index 84114aa..42d4d67 100644 (file)
@@ -12,7 +12,7 @@ declare namespace Cypress {
  Type to input with id some text
  *********************************/
 function setReduxState(state?: string) : void {
-  cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/basicRedux.json').then((res) => {
+  cy.readFile('cypress/support/jsonBuilders/mocks/jsons/basicRedux.json').then((res) => {
     cy.window().then((win) => {
       win.sessionStorage.setItem('reduxState',  JSON.stringify(state ? state : res));
     });
index acb58c2..669db05 100644 (file)
@@ -11,7 +11,7 @@ declare namespace Cypress {
 }
 
 function initGetSubscribers(response? : JSON) : void {
-  cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/subscribers.json').then((res) => {
+  cy.readFile('cypress/support/jsonBuilders/mocks/jsons/subscribers.json').then((res) => {
     cy.server()
       .route({
         method: 'GET',
@@ -23,7 +23,7 @@ function initGetSubscribers(response? : JSON) : void {
 }
 
 function initAaiGetFullSubscribers(response? : JSON) : void {
-  cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/subscribers.json').then((res) => {
+  cy.readFile('cypress/support/jsonBuilders/mocks/jsons/subscribers.json').then((res) => {
     cy.server()
       .route({
         method: 'GET',
@@ -35,7 +35,7 @@ function initAaiGetFullSubscribers(response? : JSON) : void {
 }
 
 function initGetAAISubDetails(response? : JSON) : void {
-  cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/aaiSubDetails.json').then((res) => {
+  cy.readFile('cypress/support/jsonBuilders/mocks/jsons/aaiSubDetails.json').then((res) => {
     cy.server()
       .route({
         method: 'GET',
@@ -47,7 +47,7 @@ function initGetAAISubDetails(response? : JSON) : void {
 }
 
 function initAlaCarteService(response? : JSON) : void {
-  cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/a-la-carteService.json').then((res) => {
+  cy.readFile('cypress/support/jsonBuilders/mocks/jsons/a-la-carteService.json').then((res) => {
     cy.server()
       .route({
         method: 'GET',
@@ -63,7 +63,7 @@ function initAlaCarteService(response? : JSON) : void {
 
 
 function initTenants(response? : JSON) : void {
-  cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/tenants.json').then((res) => {
+  cy.readFile('cypress/support/jsonBuilders/mocks/jsons/tenants.json').then((res) => {
     cy.server()
       .route({
         method: 'GET',
@@ -75,7 +75,7 @@ function initTenants(response? : JSON) : void {
 }
 
 function initAAIServices(response? : JSON) : void {
-  cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/aaiServices.json').then((res) => {
+  cy.readFile('cypress/support/jsonBuilders/mocks/jsons/aaiServices.json').then((res) => {
     cy.server()
       .route({
         method: 'GET',
@@ -87,7 +87,7 @@ function initAAIServices(response? : JSON) : void {
 }
 
 function initZones(response? : JSON) : void {
-  cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/zones.json').then((res) => {
+  cy.readFile('cypress/support/jsonBuilders/mocks/jsons/zones.json').then((res) => {
     cy.server()
       .route({
         method: 'GET',
@@ -124,7 +124,7 @@ function initActiveNetworks(response? : JSON) : void {
 }
 
 function initActiveVPNs(response? : JSON) : void {
-  cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/aaiActiveVPNs.json').then((res) => {
+  cy.readFile('cypress/support/jsonBuilders/mocks/jsons/aaiActiveVPNs.json').then((res) => {
     cy.server()
       .route({
         method: 'GET',
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/get_vnf_data.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/get_vnf_data.json
new file mode 100644 (file)
index 0000000..78bef0f
--- /dev/null
@@ -0,0 +1,556 @@
+{
+  "results": [
+    {
+      "id": "3400916992",
+      "node-type": "service-instance",
+      "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/66b13cb4-b575-449f-aa45-ffbfe005c7b1",
+      "properties": {
+        "service-instance-id": "66b13cb4-b575-449f-aa45-ffbfe005c7b1",
+        "service-instance-name": "CHARLOTTE_preload_1710_0914",
+        "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+        "model-version-id": "1525f534-99a2-408f-b847-ff636997d352",
+        "resource-version": "1505856078810",
+        "orchestration-status": "Active"
+      },
+      "related-to": [
+        {
+          "id": "10207440",
+          "node-type": "service-subscription",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson"
+        },
+        {
+          "id": "3481829392",
+          "node-type": "generic-vnf",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec"
+        }
+      ]
+    },
+    {
+      "id": "890175488",
+      "node-type": "model-ver",
+      "url": "/aai/v17/service-design-and-creation/models/model/1525f534-99a2-408f-b847-ff636997d352model-vers/model-ver/modelVersionKey2-369-as988q",
+      "properties":       {
+        "model-version-id": "1525f534-99a2-408f-b847-ff636997d352",
+        "model-name": "vnfc8",
+        "model-version": "1.1",
+        "resource-version": "1563820653007"
+      },
+      "related-to": [      {
+        "id": "3400916992",
+        "relationship-label": "org.onap.relationships.inventory.BelongsTo",
+        "node-type": "service-instance",
+        "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/66b13cb4-b575-449f-aa45-ffbfe005c7b1"
+      }]
+    },
+    {
+      "id": "3771572432",
+      "node-type": "service-instance",
+      "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/f195837b-ef28-42c3-8dea-47ad37eaed95",
+      "properties": {
+        "service-instance-id": "f195837b-ef28-42c3-8dea-47ad37eaed95",
+        "service-instance-name": "CHARLOTTE_preload_1710_0914_0920",
+        "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+        "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616",
+        "resource-version": "1505964829466",
+        "orchestration-status": "Active"
+      },
+      "related-to": [
+        {
+          "id": "10207440",
+          "node-type": "service-subscription",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson"
+        },
+        {
+          "id": "3484520464",
+          "node-type": "generic-vnf",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1"
+        }
+      ]
+    },
+    {
+      "id": "3775807704",
+      "node-type": "service-instance",
+      "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/9ad4ac55-a5e0-4b49-95c0-b2d846abf700",
+      "properties": {
+        "service-instance-id": "9ad4ac55-a5e0-4b49-95c0-b2d846abf700",
+        "service-instance-name": "CHARLOTTE_preload_1710_0914_100417",
+        "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+        "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616",
+        "resource-version": "1507144734087",
+        "orchestration-status": "Active"
+      },
+      "related-to": [
+        {
+          "id": "10207440",
+          "node-type": "service-subscription",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson"
+        },
+        {
+          "id": "3783459064",
+          "node-type": "generic-vnf",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/54626a59-ec0d-4fa9-b0c2-08d008688165"
+        }
+      ]
+    },
+    {
+      "id": "4178862184",
+      "node-type": "service-instance",
+      "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/599c7247-b083-447c-b6b1-0cdd5170dfd2",
+      "properties": {
+        "service-instance-id": "599c7247-b083-447c-b6b1-0cdd5170dfd2",
+        "service-instance-name": "CHARLOTTE_preload_1710_0914_1010",
+        "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+        "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616",
+        "resource-version": "1507664240411",
+        "orchestration-status": "Active"
+      },
+      "related-to": [
+        {
+          "id": "10207440",
+          "node-type": "service-subscription",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson"
+        },
+        {
+          "id": "3892133896",
+          "node-type": "generic-vnf",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/d74503d8-abab-49c6-ba48-a6211eee9b7a"
+        }
+      ]
+    },
+    {
+      "id": "3008335920",
+      "node-type": "service-instance",
+      "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08",
+      "properties": {
+        "service-instance-id": "97315a05-e6f3-4c47-ae7e-d850c327aa08",
+        "service-instance-name": "CHARLOTTE_preload_1710_0914_0927",
+        "model-invariant-id": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0",
+        "model-version-id": "3915de55-a904-4cc6-8fc3-86f8bc316616",
+        "resource-version": "1506527653053",
+        "orchestration-status": "Active"
+      },
+      "related-to": [
+        {
+          "id": "10207440",
+          "node-type": "service-subscription",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson"
+        },
+        {
+          "id": "3418898432",
+          "node-type": "generic-vnf",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855"
+        }
+      ]
+    },
+    {
+      "id": "3481829392",
+      "node-type": "generic-vnf",
+      "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec",
+      "properties": {
+        "vnf-id": "0c465dd3-4151-4da9-92a2-541bb3174cec",
+        "vnf-name": "Eoghan Fausto",
+        "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
+        "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+        "prov-status": "PREPROV",
+        "orchestration-status": "Created",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1505856137206",
+        "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+        "model-version-id": "afacccf6-397d-45d6-b5ae-94c39734b168",
+        "model-customization-id": "b54689f8-45c5-4be2-9e91-f033e028feec",
+        "nf-type": "DNS",
+        "nf-function": "Mobile DNS",
+        "nf-role": "vWheeler",
+        "nf-naming-code": "null"
+      },
+      "related-to": [
+        {
+          "id": "3285635208",
+          "node-type": "vf-module",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/d49713bf-1bff-4eab-bed1-a8f1bb83aa98"
+        },
+        {
+          "id": "3441209432",
+          "node-type": "vf-module",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/b8397fec-cf13-40b3-be8f-7d0912506419"
+        },
+        {
+          "id": "3687522312",
+          "node-type": "vf-module",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0c465dd3-4151-4da9-92a2-541bb3174cec/vf-modules/vf-module/fd098a52-09be-4c48-a9e9-a565d1b39db3"
+        },
+        {
+          "id": "3400916992",
+          "node-type": "service-instance",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/66b13cb4-b575-449f-aa45-ffbfe005c7b1"
+        },
+        {
+          "id": "3477385312",
+          "node-type": "vserver",
+          "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976"
+        }
+      ]
+    },
+    {
+      "id": "3484520464",
+      "node-type": "generic-vnf",
+      "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1",
+      "properties": {
+        "vnf-id": "c2d2d389-fa00-4fb4-a269-e46d495719e1",
+        "vnf-name": "Odell Romana",
+        "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
+        "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+        "prov-status": "PREPROV",
+        "orchestration-status": "Created",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1505964996823",
+        "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+        "model-version-id": "76e908e0-5201-44d2-a3e2-9e6128d05820",
+        "model-customization-id": "c00e8fc8-af39-4da8-8c78-a7efc2fe5994",
+        "nf-type": "DNS",
+        "nf-function": "Mobile DNS",
+        "nf-role": "vMobileDNS",
+        "nf-naming-code": "null"
+      },
+      "related-to": [
+        {
+          "id": "3447107680",
+          "node-type": "vf-module",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/c4711b5c-742e-4d03-8146-bff763f69fbd"
+        },
+        {
+          "id": "3448307712",
+          "node-type": "vf-module",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/0ba3fcdd-0536-4ac7-a9ec-8d8622db7fb2"
+        },
+        {
+          "id": "3692179528",
+          "node-type": "vf-module",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/6bb843eb-ef84-43b1-83b4-3154a7f9928c"
+        },
+        {
+          "id": "3771588816",
+          "node-type": "vf-module",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/a4c008c6-cac0-4e3f-928f-90fa37dc8c4b"
+        },
+        {
+          "id": "3904077944",
+          "node-type": "vf-module",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/eecb619c-a173-4ead-bf48-d4d09cbbdd5e"
+        },
+        {
+          "id": "4027855088",
+          "node-type": "vf-module",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/1e29424e-2dca-45ac-b1df-59a8f74d0bc1"
+        },
+        {
+          "id": "4390871192",
+          "node-type": "vf-module",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/b185220a-7f63-4b29-867d-1452813a4f09"
+        },
+        {
+          "id": "4450529432",
+          "node-type": "vf-module",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/c2d2d389-fa00-4fb4-a269-e46d495719e1/vf-modules/vf-module/7a0c4b98-b3cc-490c-bbab-e2d7f169f2d7"
+        },
+        {
+          "id": "3771572432",
+          "node-type": "service-instance",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/f195837b-ef28-42c3-8dea-47ad37eaed95"
+        }
+      ]
+    },
+    {
+      "id": "3783459064",
+      "node-type": "generic-vnf",
+      "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/54626a59-ec0d-4fa9-b0c2-08d008688165",
+      "properties": {
+        "vnf-id": "54626a59-ec0d-4fa9-b0c2-08d008688165",
+        "vnf-name": "Dominika Fionnbharr",
+        "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
+        "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+        "prov-status": "PREPROV",
+        "orchestration-status": "Created",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1507144948937",
+        "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+        "model-version-id": "76e908e0-5201-44d2-a3e2-9e6128d05820",
+        "model-customization-id": "c00e8fc8-af39-4da8-8c78-a7efc2fe5994",
+        "nf-type": "DNS",
+        "nf-function": "Mobile DNS",
+        "nf-role": "vMobileDNS",
+        "nf-naming-code": "null"
+      },
+      "related-to": [
+        {
+          "id": "3775807704",
+          "node-type": "service-instance",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/9ad4ac55-a5e0-4b49-95c0-b2d846abf700"
+        }
+      ]
+    },
+    {
+      "id": "3892133896",
+      "node-type": "generic-vnf",
+      "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/d74503d8-abab-49c6-ba48-a6211eee9b7a",
+      "properties": {
+        "vnf-id": "d74503d8-abab-49c6-ba48-a6211eee9b7a",
+        "vnf-name": "CHARLOTTE_PreloadTest_VNF",
+        "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
+        "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+        "prov-status": "PREPROV",
+        "orchestration-status": "Created",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1507664288548",
+        "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+        "model-version-id": "76e908e0-5201-44d2-a3e2-9e6128d05820",
+        "model-customization-id": "c00e8fc8-af39-4da8-8c78-a7efc2fe5994",
+        "nf-type": "DNS",
+        "nf-function": "Mobile DNS",
+        "nf-role": "vMobileDNS",
+        "nf-naming-code": "null"
+      },
+      "related-to": [
+        {
+          "id": "4178862184",
+          "node-type": "service-instance",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/599c7247-b083-447c-b6b1-0cdd5170dfd2"
+        }
+      ]
+    },
+    {
+      "id": "1507690314",
+      "node-type": "generic-vnf",
+      "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/385548e2-3f31-4900-9437-317d0346e49a",
+      "properties": {
+        "vnf-id": "385548e2-3f31-4900-9437-317d0346e49a",
+        "vnf-name": "Senga Gabrielle",
+        "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
+        "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+        "prov-status": "PREPROV",
+        "orchestration-status": "Created",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "7788675952902",
+        "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+        "model-version-id": "b217c612-7fcf-484c-861b-df0a5c4b5bcb",
+        "model-customization-id": "ce15d245-763c-4079-ac82-fe93007adb69",
+        "nf-type": "DNS",
+        "nf-function": "Mobile DNS",
+        "nf-role": "vMobileDNS",
+        "nf-naming-code": "null"
+      },
+      "related-to": [
+        {
+          "id": "3664617648",
+          "node-type": "vf-module",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc"
+        },
+        {
+          "id": "3008335920",
+          "node-type": "service-instance",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08"
+        },
+        {
+          "id": "3477385312",
+          "node-type": "vserver",
+          "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976"
+        }
+      ]
+    },
+    {
+      "id": "5278880615",
+      "node-type": "generic-vnf",
+      "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/0465e048-92a4-4a7f-bfe7-de39b32de4bd",
+      "properties": {
+        "vnf-id": "0465e048-92a4-4a7f-bfe7-de39b32de4bd",
+        "vnf-name": "Constantius Raghu",
+        "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
+        "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+        "prov-status": "PREPROV",
+        "orchestration-status": "Created",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "7788675952902",
+        "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+        "model-version-id": "afacccf6-397d-45d6-b5ae-94c39734b168",
+        "model-customization-id": "ce15d245-763c-4079-ac82-fe93007adb69",
+        "nf-type": "DNS",
+        "nf-function": "Mobile DNS",
+        "nf-role": "vWheeler",
+        "nf-naming-code": "null"
+      },
+      "related-to": [
+        {
+          "id": "3664617648",
+          "node-type": "vf-module",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc"
+        },
+        {
+          "id": "3008335920",
+          "node-type": "service-instance",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08"
+        },
+        {
+          "id": "3477385312",
+          "node-type": "vserver",
+          "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976"
+        }
+      ]
+    },
+    {
+      "id": "3418898432",
+      "node-type": "generic-vnf",
+      "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855",
+      "properties": {
+        "vnf-id": "8e5e3ba1-3fe6-4d86-966e-f9f03dab4855",
+        "vnf-name": "zolson3amdns02test2",
+        "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
+        "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+        "prov-status": "PREPROV",
+        "orchestration-status": "Created",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "1507132024933",
+        "model-invariant-id": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8",
+        "model-version-id": "76e908e0-5201-44d2-a3e2-9e6128d05820",
+        "model-customization-id": "c00e8fc8-af39-4da8-8c78-a7efc2fe5994",
+        "nf-type": "DNS",
+        "nf-function": "Mobile DNS",
+        "nf-role": "vMobileDNS",
+        "nf-naming-code": "null"
+      },
+      "related-to": [
+        {
+          "id": "3664617648",
+          "node-type": "vf-module",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc"
+        },
+        {
+          "id": "3008335920",
+          "node-type": "service-instance",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08"
+        },
+        {
+          "id": "3477385312",
+          "node-type": "vserver",
+          "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976"
+        },
+        {
+          "id": "3647635704",
+          "node-type": "vserver",
+          "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b30b17e9-10d0-4475-b558-7d18ae0aade0"
+        },
+        {
+          "id": "3664621744",
+          "node-type": "vserver",
+          "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/d3b293ba-85de-440e-904b-9dad160fbdce"
+        },
+        {
+          "id": "3975352504",
+          "node-type": "vserver",
+          "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/495a9a72-c9f6-41ed-93eb-065ebc2bfb1f"
+        },
+        {
+          "id": "4059455552",
+          "node-type": "vserver",
+          "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/b4b9f419-3ed4-4bd8-bb2e-32b0a98e80b7"
+        },
+        {
+          "id": "4098130088",
+          "node-type": "vserver",
+          "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/94c79f43-e76d-461e-b8df-8af2acb08e1e"
+        },
+        {
+          "id": "4401291416",
+          "node-type": "vserver",
+          "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/99cad3c6-1301-49c4-ad67-ae3c955de5f1"
+        },
+        {
+          "id": "4458950808",
+          "node-type": "vserver",
+          "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/mdt1/tenants/tenant/88a6ca3ee0394ade9403f075db23167e/vservers/vserver/047354dc-0244-4241-b24a-7d7b00413b82"
+        }
+      ]
+    },
+    {
+      "id": "1024648346",
+      "node-type": "generic-vnf",
+      "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/a58bf551-a79c-42d1-83b4-ed9288036245",
+      "properties": {
+        "vnf-id": "a58bf551-a79c-42d1-83b4-ed9288036245",
+        "vnf-name": "Harrison Kris",
+        "vnf-type": "CHARLOTTE preload 1710 0914/CHARLOTTE preload 1710 0914 0",
+        "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
+        "prov-status": "PREPROV",
+        "orchestration-status": "Created",
+        "in-maint": false,
+        "is-closed-loop-disabled": false,
+        "resource-version": "4679861552759",
+        "model-invariant-id": "00beb8f9-6d39-452f-816d-c709b9cbb87d",
+        "model-version-id": "0903e1c0-8e03-4936-b5c2-260653b96413",
+        "model-customization-id": "14e8057d-b22a-405c-84aa-90b82bfd6e46",
+        "nf-type": "DNS",
+        "nf-function": "Mobile DNS",
+        "nf-role": "vMobileDNS",
+        "nf-naming-code": "null"
+      },
+      "related-to": [
+        {
+          "id": "3664617648",
+          "node-type": "vf-module",
+          "url": "https://aai.onap.org:8443/aai/v10/network/generic-vnfs/generic-vnf/8e5e3ba1-3fe6-4d86-966e-f9f03dab4855/vf-modules/vf-module/788cde64-c288-4971-8e8c-77973c5009dc"
+        },
+        {
+          "id": "3008335920",
+          "node-type": "service-instance",
+          "url": "https://aai.onap.org:8443/aai/v10/business/customers/customer/a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb/service-subscriptions/service-subscription/vRichardson/service-instances/service-instance/97315a05-e6f3-4c47-ae7e-d850c327aa08"
+        },
+        {
+          "id": "3477385312",
+          "node-type": "vserver",
+          "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/8627b971-1032-420f-a044-6802f0ab6976"
+        },
+        {
+          "id": "3647635704",
+          "node-type": "vserver",
+          "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b30b17e9-10d0-4475-b558-7d18ae0aade0"
+        },
+        {
+          "id": "3664621744",
+          "node-type": "vserver",
+          "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/d3b293ba-85de-440e-904b-9dad160fbdce"
+        },
+        {
+          "id": "3975352504",
+          "node-type": "vserver",
+          "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/495a9a72-c9f6-41ed-93eb-065ebc2bfb1f"
+        },
+        {
+          "id": "4059455552",
+          "node-type": "vserver",
+          "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/b4b9f419-3ed4-4bd8-bb2e-32b0a98e80b7"
+        },
+        {
+          "id": "4098130088",
+          "node-type": "vserver",
+          "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/94c79f43-e76d-461e-b8df-8af2acb08e1e"
+        },
+        {
+          "id": "4401291416",
+          "node-type": "vserver",
+          "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/99cad3c6-1301-49c4-ad67-ae3c955de5f1"
+        },
+        {
+          "id": "4458950808",
+          "node-type": "vserver",
+          "url": "https://aai.onap.org:8443/aai/v10/cloud-infrastructure/cloud-regions/cloud-region/irma-aic/olson3/tenants/tenant/eecd15e8e7ee46c3bbc2096f0924f4c4/vservers/vserver/047354dc-0244-4241-b24a-7d7b00413b82"
+        }
+      ]
+    }
+  ]
+}
index 9698f47..052fb8a 100644 (file)
@@ -17,7 +17,7 @@ function preventErrorsOnLoading() : void {
 }
 
 function initGetToMenuInfo(response? : JSON) : void {
-    cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/topMenuInfo.json').then((res) => {
+    cy.readFile('cypress/support/jsonBuilders/mocks/jsons/topMenuInfo.json').then((res) => {
       cy.server()
         .route({
           method: 'GET',
@@ -31,7 +31,7 @@ function initGetToMenuInfo(response? : JSON) : void {
 
 
 function initCategoryParameter(response? : JSON) : void {
-    cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/categoryParametres.json').then((res) => {
+    cy.readFile('cypress/support/jsonBuilders/mocks/jsons/categoryParametres.json').then((res) => {
       cy.server()
         .route({
           method: 'GET',
@@ -43,7 +43,7 @@ function initCategoryParameter(response? : JSON) : void {
 }
 
 function initFlags(response? : JSON, delay?: number, status?: number) : void {
-  cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/flags.json').then((res) => {
+  cy.readFile('cypress/support/jsonBuilders/mocks/jsons/flags.json').then((res) => {
     cy.server()
       .route({
         method: 'GET',
@@ -56,7 +56,7 @@ function initFlags(response? : JSON, delay?: number, status?: number) : void {
 }
 
 function initAuditInfoVID(response? : JSON, delay?: number, status?: number) : void {
-  cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/auditInfoVid.json').then((res) => {
+  cy.readFile('cypress/support/jsonBuilders/mocks/jsons/auditInfoVid.json').then((res) => {
     cy.server()
       .route({
         method: 'GET',
@@ -69,7 +69,7 @@ function initAuditInfoVID(response? : JSON, delay?: number, status?: number) : v
 }
 
 function initAuditInfoMSO(response? : JSON, delay?: number, status?: number) : void {
-  cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/auditInfoMSO.json').then((res) => {
+  cy.readFile('cypress/support/jsonBuilders/mocks/jsons/auditInfoMSO.json').then((res) => {
     cy.server()
       .route({
         method: 'GET',
@@ -95,7 +95,7 @@ function initAuditInfoMSOALaCarte(response? : JSON, delay?: number, status?: num
 }
 
 function initAsyncInstantiation(response? : JSON, delay?: number, status?: number) : void {
-  cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/basicAsyncInstantiation.json').then((res) => {
+  cy.readFile('cypress/support/jsonBuilders/mocks/jsons/basicAsyncInstantiation.json').then((res) => {
     cy.server()
       .route({
         method: 'GET',