diff options
author | Ittay Stern <ittay.stern@att.com> | 2018-08-29 17:01:32 +0300 |
---|---|---|
committer | Ittay Stern <ittay.stern@att.com> | 2019-02-18 18:35:30 +0200 |
commit | 6f900cc45d7dd7f97430812b86b5c1d1693c8ae3 (patch) | |
tree | 936005c364dc5a7264d6304d4777c3d83494db22 /vid-webpack-master/cypress/support | |
parent | 67d99f816cc583643c35193197594cf78d8ce60a (diff) |
merge from ecomp a88f0072 - Modern UI
Issue-ID: VID-378
Change-Id: Ibcb23dd27f550cf32ce2fe0239f0f496ae014ff6
Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-webpack-master/cypress/support')
70 files changed, 6746 insertions, 846 deletions
diff --git a/vid-webpack-master/cypress/support/application/application.session.actions.ts b/vid-webpack-master/cypress/support/application/application.session.actions.ts index 490016bf6..19f6881f6 100644 --- a/vid-webpack-master/cypress/support/application/application.session.actions.ts +++ b/vid-webpack-master/cypress/support/application/application.session.actions.ts @@ -1,6 +1,10 @@ declare namespace Cypress { interface Chainable { setReduxState : typeof setReduxState; + getReduxState : typeof getReduxState; + setTestApiParamToGR: typeof setTestApiParamToGR; + setTestApiParamToVNF: typeof setTestApiParamToVNF; + buildReduxStateWithServiceRespone: typeof buildReduxStateWithServiceRespone; } } @@ -14,8 +18,59 @@ function setReduxState(state?: string) : void { }); }); } +function getReduxState(): Chainable<any> { + return cy.window().then((win) => { + let stateRaw = win.sessionStorage.getItem('reduxState'); + return JSON.parse(stateRaw ? stateRaw : '{}'); + }); +} + +function setTestApiParamToGR() : void { + cy.window().then((win) => { + win.sessionStorage.setItem('msoRequestParametersTestApiValue', 'GR_API'); + }); +} + +function setTestApiParamToVNF() : void { + cy.window().then((win) => { + win.sessionStorage.setItem('msoRequestParametersTestApiValue', 'VNF_API'); + }); +} +function updateObject(obj: any, key: string, val: any, value:any) { + return JSON.parse(JSON.stringify(obj) + .replace(new RegExp(`"${key}":"${val}"`), `"${key}":"${value}"`)) +} +function buildReduxStateWithServiceRespone(res: any, serviceId:string, isEcompGeneratedNaming:boolean) :void { + res = updateObject(res, "ecomp_generated_naming", !isEcompGeneratedNaming, isEcompGeneratedNaming); + cy.window().then((win) => { + win.sessionStorage.setItem('reduxState', JSON.stringify({ + "global": { + "name": null + }, + "service": { + "serviceHierarchy": { + [serviceId] : res + }, + "serviceInstance": { + [serviceId]: { + "existingVNFCounterMap": {}, + "existingVnfGroupCounterMap": {}, + "existingNetworksCounterMap": {}, + "vnfs": {}, + "vnfGroups": {}, + "isEcompGeneratedNaming": isEcompGeneratedNaming, + "existingNames": {} + } + } + } + })); + }); +} Cypress.Commands.add('setReduxState', setReduxState); - +Cypress.Commands.add('getReduxState', getReduxState); +Cypress.Commands.add('setTestApiParamToGR', setTestApiParamToGR); +Cypress.Commands.add('setTestApiParamToVNF',setTestApiParamToVNF); +Cypress.Commands.add('buildReduxStateWithServiceRespone', buildReduxStateWithServiceRespone); diff --git a/vid-webpack-master/cypress/support/elements/element.actions.ts b/vid-webpack-master/cypress/support/elements/element.actions.ts index 2d30aa1b1..44e85830c 100644 --- a/vid-webpack-master/cypress/support/elements/element.actions.ts +++ b/vid-webpack-master/cypress/support/elements/element.actions.ts @@ -7,6 +7,7 @@ declare namespace Cypress { isElementEnabled : typeof isElementEnabled; hasClass : typeof hasClass; getElementByDataTestsId : typeof getElementByDataTestsId; + getTagElementContainsText : typeof getTagElementContainsText; } } @@ -14,36 +15,42 @@ declare namespace Cypress { isElementContainsAttr : check if element with id contains some attribute *************************************************************************/ function isElementContainsAttr(id : string, attr: string) : void { - cy.get("[data-tests-id='" + id +"']") - .should('have.attr', attr); + cy.getElementByDataTestsId(id).should('have.attr', attr); } /********************************************************* isElementDisabled : check if element with id is disabled *********************************************************/ function isElementDisabled(id : string) : void { - cy.get( "[data-tests-id='" + id +"']").should('be:disabled'); + cy.getElementByDataTestsId(id).should('be:disabled'); } function isElementEnabled(id : string) : void { - cy.get( "button[data-tests-id='" + id +"']").should('be:enabled'); + cy.getElementByDataTestsId(id).should('be:enabled'); } /**************************************************************** hasClass : check if element with id contains some class name ****************************************************************/ function hasClass(id : string, className : string) : void { - cy.get( "[data-tests-id='" + id +"']") - .should('have.class', className); + cy.getElementByDataTestsId(id).should('have.class', className); } function getElementByDataTestsId(dataTestsId : string) : Chainable<JQuery<HTMLElement>> { return cy.get( "[data-tests-id='" + dataTestsId +"']"); } +/************************************************** + getTagElementContainsText : return tag with text + **************************************************/ +function getTagElementContainsText(tag : string, text : string) : Chainable<JQuery<HTMLElement>> { + return cy.contains(tag,text); +} + Cypress.Commands.add('isElementContainsAttr', isElementContainsAttr); Cypress.Commands.add('isElementDisabled', isElementDisabled); Cypress.Commands.add('isElementEnabled', isElementEnabled); Cypress.Commands.add('hasClass', hasClass); Cypress.Commands.add('getElementByDataTestsId', getElementByDataTestsId); +Cypress.Commands.add('getTagElementContainsText', getTagElementContainsText); diff --git a/vid-webpack-master/cypress/support/elements/element.input.actions.ts b/vid-webpack-master/cypress/support/elements/element.input.actions.ts index 714daf98a..4e6b5e879 100644 --- a/vid-webpack-master/cypress/support/elements/element.input.actions.ts +++ b/vid-webpack-master/cypress/support/elements/element.input.actions.ts @@ -4,6 +4,7 @@ declare namespace Cypress { blurInput : typeof blurInput; focusInput : typeof focusInput; shouldInputContainsText: typeof shouldInputContainsText; + clearInput: typeof clearInput; } } @@ -15,32 +16,38 @@ function typeToInput(id : string, text : string) : void { .type(text, {force: true}); } +/********************************** + clear input + *********************************/ +function clearInput(id : string) : void { + cy.get( "[data-tests-id='" + id +"']") + .clear(); +} + /******************** blur input with id ********************/ function blurInput(id : string) : void { - cy.get( "[data-tests-id='" + id +"']") - .blur(); + cy.getElementByDataTestsId(id).blur(); } /******************** focus input with id ********************/ function focusInput(id : string) : void { - cy.get( "[data-tests-id='" + id +"']") - .focus(); + cy.getElementByDataTestsId(id).focus(); } /***************************************** test if input with id contains some text ****************************************/ function shouldInputContainsText(id : string, text : string) : void { - cy.get( "[data-tests-id='" + id +"']") - .contains('text') + cy.getElementByDataTestsId(id).contains('text') } Cypress.Commands.add('typeToInput', typeToInput); Cypress.Commands.add('blurInput', blurInput); Cypress.Commands.add('focusInput', focusInput); Cypress.Commands.add('shouldInputContainsText', shouldInputContainsText); +Cypress.Commands.add('clearInput', clearInput); diff --git a/vid-webpack-master/cypress/support/elements/element.select.actions.ts b/vid-webpack-master/cypress/support/elements/element.select.actions.ts index 452323d3d..1f8eea024 100644 --- a/vid-webpack-master/cypress/support/elements/element.select.actions.ts +++ b/vid-webpack-master/cypress/support/elements/element.select.actions.ts @@ -1,6 +1,7 @@ declare namespace Cypress { interface Chainable { selectDropdownOptionByText : typeof selectDropdownOptionByText; + checkIsOptionSelected : typeof checkIsOptionSelected; } } @@ -12,5 +13,14 @@ function selectDropdownOptionByText(selectId : string, optionText : string) : vo .select(optionText); } +/************************************************ + check if option is selected + ************************************************/ +function checkIsOptionSelected(selectId : string, optionText : string) : void { + cy.getElementByDataTestsId(selectId) + .should('have.value', optionText) +} + Cypress.Commands.add('selectDropdownOptionByText', selectDropdownOptionByText); +Cypress.Commands.add('checkIsOptionSelected', checkIsOptionSelected); diff --git a/vid-webpack-master/cypress/support/index.js b/vid-webpack-master/cypress/support/index.js index 7b8506a1b..a757a16ed 100644 --- a/vid-webpack-master/cypress/support/index.js +++ b/vid-webpack-master/cypress/support/index.js @@ -16,6 +16,12 @@ // Import commands.js using ES2015 syntax: import './commands'; import './steps/login.step'; +import './steps/fill.service.popup.step'; +import './steps/fill.vnf.popup.step'; +import './steps/fill.network.step'; +import './steps/fill.vfModule.step'; +import './steps/menu.step'; +import './steps/openInstanceAuditInfoModal.step'; import './elements/element.actions'; import './elements/element.input.actions'; import './elements/element.select.actions'; @@ -23,8 +29,21 @@ import './application/application.session.actions'; import './elements/element.table.actions'; import './jsonBuilders/mocks/aai.mock'; import './jsonBuilders/mocks/vid.mock'; +import './jsonBuilders/mocks/permission.mock'; + + +import './steps/general/compareDeepObjects.step'; +import './steps/drawingBoard/drawingBoardModel.steps'; +import './steps/drawingBoard/drawingBoardTree.steps'; +import './steps/genericForm/genericFormAction.steps'; +import './steps/drawingBoard/general.steps'; +import './steps/general/clickOutside.step'; +import './steps/drawingBoard/drawingBoardComponentInfo.steps'; +import './steps/genericForm/checkPopover.step'; // Alternatively you can use CommonJS syntax: // require('./commands') - +Cypress.Screenshot.defaults({ + capture: 'runner' +}); diff --git a/vid-webpack-master/cypress/support/jsonBuilders/jsonBuilder.ts b/vid-webpack-master/cypress/support/jsonBuilders/jsonBuilder.ts index 0bab4e1da..2583d46a1 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/jsonBuilder.ts +++ b/vid-webpack-master/cypress/support/jsonBuilders/jsonBuilder.ts @@ -1,6 +1,9 @@ export class JsonBuilder<T> implements IJsonBuilder<T>{ - currentValue: T; + currentValue?: T; + constructor(currentValue ?: T){ + this.currentValue = currentValue; + } public basicJson(json: JSON, url: string, status: number, delay: number, alias: string, changeResFunc?: Function) : void { this.currentValue = <T>JSON.parse(JSON.stringify(json)); this.currentValue = changeResFunc ? changeResFunc(this.currentValue) : this.currentValue; @@ -17,9 +20,9 @@ export class JsonBuilder<T> implements IJsonBuilder<T>{ response: JSON.stringify(this.currentValue) }).as(alias); } - public basicMock(jsonPath: string, url: string) { + public basicMock(jsonPath: string, url: string ,changeResFunc?: Function) { cy.readFile(jsonPath).then((res) => { - this.basicJson(res, url, 200, 0, url,); + this.basicJson(res, url, 200, 0, url, changeResFunc); }) } } diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/aai.mock.ts b/vid-webpack-master/cypress/support/jsonBuilders/mocks/aai.mock.ts index a95487731..6cb8f6171 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/aai.mock.ts +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/aai.mock.ts @@ -3,6 +3,8 @@ declare namespace Cypress { initAAIMock: typeof initAAIMock; initAlaCarteService : typeof initAlaCarteService; initZones : typeof initZones; + initTenants : typeof initTenants; + initSearchVNFMemebers : typeof initSearchVNFMemebers; } } @@ -18,6 +20,18 @@ function initGetSubscribers(response? : JSON) : void { }); } +function initAaiGetFullSubscribers(response? : JSON) : void { + cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/subscribers.json').then((res) => { + cy.server() + .route({ + method: 'GET', + status : 200, + url : Cypress.config('baseUrl') + "/aai_get_full_subscribers**", + response : response ? response : res + }).as('initGetSubscribers') + }); +} + function initGetAAISubDetails(response? : JSON) : void { cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/aaiSubDetails.json').then((res) => { cy.server() @@ -42,6 +56,22 @@ function initAlaCarteService(response? : JSON) : void { }); } + + + + +function initTenants(response? : JSON) : void { + cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/tenants.json').then((res) => { + cy.server() + .route({ + method: 'GET', + status: 200, + url: Cypress.config('baseUrl') + "/aai_get_tenants/**", + response: response ? response : res + }).as('initTenants') + }); +} + function initAAIServices(response? : JSON) : void { cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/aaiServices.json').then((res) => { cy.server() @@ -66,15 +96,34 @@ function initZones(response? : JSON) : void { }); } +//Mock of vnf's that members for VNF Group +function initSearchVNFMemebers(response? : JSON) : void { + cy.readFile('../vid-automation/src/test/resources/VnfGroup/searchMembersResponse.json').then((res) => { + cy.server() + .route({ + method: 'GET', + status : 200, + url : Cypress.config('baseUrl') + "/aai_search_group_members/**", + response : response ? response : res + }).as(('searchVNFMembers')); + }); +} + + function initAAIMock(): void { + initAaiGetFullSubscribers(); initGetSubscribers(); initAAIServices(); + initTenants(); } Cypress.Commands.add('initAAIMock', initAAIMock); Cypress.Commands.add('initAlaCarteService', initAlaCarteService); Cypress.Commands.add('initZones', initZones); +Cypress.Commands.add('initTenants', initTenants); +Cypress.Commands.add('initAaiGetFullSubscribers', initAaiGetFullSubscribers); +Cypress.Commands.add('initSearchVNFMemebers', initSearchVNFMemebers); diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aLaCarteAuditInfoMSO.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aLaCarteAuditInfoMSO.json new file mode 100644 index 000000000..290ca6cee --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aLaCarteAuditInfoMSO.json @@ -0,0 +1,13 @@ +[ + { + "id": null, + "jobId": "20fb575c-130a-4c5e-b434-50440bf992ec", + "instanceName": "instance name 1", + "jobStatus": "COMPLETE", + "source": "MSO", + "requestId": "c0011670-0e1a-4b74-945d-8bf5aede1d9c", + "additionalInfo": "Service Instance was created successfully.", + "final": null, + "createdDate": 1526471134058 + } +] diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiGetHomingData.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiGetHomingData.json new file mode 100644 index 000000000..d8a7faab2 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiGetHomingData.json @@ -0,0 +1,7 @@ +{ + "tenantName": "USP-SIP-IC-24335-T-01", + "tenantID": "092eb9e8e4b7412e8787dd091bc58e86", + "cloudOwner": "irma-aic", + "cloudRegionID": "JANET25", + "is-permitted": true +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiServiceInstances.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiServiceInstances.json index 3435ff07e..61708d887 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiServiceInstances.json +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiServiceInstances.json @@ -7,8 +7,18 @@ "isPermitted": true, "serviceInstanceId": "3f93c7cb-2fd0-4557-9514-e189b7b04f9d", "serviceInstanceName": "vid-test-444", - "serviceType": "VIRTUAL USP", - "subscriberName": "USP VOICE" + "serviceType": "TYLER SILVIA", + "subscriberName": "SILVIA ROBBINS" + }, + { + "aaiModelInvariantId": "12343f9e-3244-4d8f-a8e0-0e5d7a29eda9", + "aaiModelVersionId": "12344bb4-a416-4b4e-997e-0059973630b9", + "globalCustomerId": "e433710f-9217-458d-a79d-1c7aff376d89", + "isPermitted": true, + "serviceInstanceId": "c187e9fe-40c3-4862-b73e-84ff056205f61234", + "serviceInstanceName": "test_fabric_config", + "serviceType": "TYLER SILVIA", + "subscriberName": "SILVIA ROBBINS" } ] } diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiServices.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiServices.json index 7b4440d48..1528c752a 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiServices.json +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiServices.json @@ -1,46 +1,136 @@ { - "service": { - "uuid": "4d71990b-d8ad-4510-ac61-496288d9078e", - "invariantUuid": "d27e42cf-087e-4d31-88ac-6c4b7585f800", - "name": "vidmacrofalsenaming", - "version": "1.0", - "toscaModelURL": null, - "category": "Network L1-3", - "serviceType": "", - "serviceRole": "", - "description": "vidmacrofalsenaming", - "serviceEcompNaming": "false", - "instantiationType": "A-La-Carte", - "inputs": {} - }, - "vnfs": {}, - "networks": { - "MULTI_PROVIDER_PORT_GROUP 0": { - "uuid": "e5d235de-2188-4f9f-a28c-fe38967883f2", - "invariantUuid": "b0303003-0abb-454c-9119-8cbe2e09e003", - "description": "Creates a neutron multi-provider VLAN network with dummy subnet", - "name": "MULTI_PROVIDER_PORT_GROUP", - "version": "1.0", - "customizationUuid": "0fde4286-ee4c-439d-9556-74b6be6bbc42", - "inputs": {}, - "commands": {}, - "properties": { - "network_assignments": "{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}", - "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}", - "network_scope": "GLOBAL", - "network_ecomp_naming": "{ecomp_generated_naming=true}", - "network_type": "MULTI_PROVIDER_PORT_GROUP", - "network_technology": "MULTI_GROUP", - "network_homing": "{ecomp_selected_instance_node_target=false}" - }, - "type": "VL", - "modelCustomizationName": "MULTI_PROVIDER_PORT_GROUP 0" + "service": [ + { + "service-id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034", + "service-description": "SCOTTIE", + "resource-version": "1494001985150", + "is-permitted": true + }, + { + "service-id": "17cc1042-527b-11e6-beb8-9e71128cae77", + "service-description": "IGNACIO", + "resource-version": "1494001922171", + "is-permitted": true + }, + { + "service-id": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e", + "service-description": "Christie", + "resource-version": "1494001855144", + "is-permitted": true + }, + { + "service-id": "a4f6f2ae-9bf5-4ed7-b904-06b2099c4bd7", + "service-description": "Enhanced Services", + "resource-version": "1494001980153", + "is-permitted": true + }, + { + "service-id": "vTerrance", + "service-description": "vTerrance", + "resource-version": "1484865266", + "is-permitted": true + }, + { + "service-id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f", + "service-description": "vSCP", + "resource-version": "1494001903012", + "is-permitted": true + }, + { + "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "service-description": "Emanuel", + "resource-version": "1503954056794", + "is-permitted": true + }, + { + "service-id": "d8a6ed93-251c-47ca-adc9-86671fd19f4c", + "service-description": "BVOIP", + "resource-version": "1490910089351", + "is-permitted": true + }, + { + "service-id": "db171b8f-115c-4992-a2e3-ee04cae357e0", + "service-description": "LINDSEY", + "resource-version": "1490910095155", + "is-permitted": true + }, + { + "service-id": "LRSI-OSPF", + "service-description": "LRSI-OSPF", + "resource-version": "1494001863930", + "is-permitted": true + }, + { + "service-id": "vRosemarie", + "service-description": "HNGATEWAY", + "resource-version": "1501192849249", + "is-permitted": true + }, + { + "service-id": "vHNPaas", + "service-description": "WILKINS", + "resource-version": "1501192982895", + "is-permitted": true + }, + { + "service-id": "e433710f-9217-458d-a79d-1c7aff376d89", + "service-description": "TYLER SILVIA", + "resource-version": "1494001802638", + "is-permitted": true + }, + { + "service-id": "b6a3f28c-eebf-494c-a900-055cc7c874ce", + "service-description": "VROUTER", + "resource-version": "1492533254036", + "is-permitted": true + }, + { + "service-id": "Cisneros", + "service-description": "vMuriel", + "resource-version": "1490910058887", + "is-permitted": true + }, + { + "service-id": "0ee8c1bc-7cbd-4b0a-a1ac-e9999255abc1", + "service-description": "CARA Griffin", + "resource-version": "1498053422512", + "is-permitted": true + }, + { + "service-id": "c7611ebe-c324-48f1-8085-94aef0c6ef3d", + "service-description": "DARREN MCGEE", + "resource-version": "1494001913639", + "is-permitted": true + }, + { + "service-id": "e30755dc-5673-4b6b-9dcf-9abdd96b93d1", + "service-description": "Transport", + "resource-version": "1506361785997", + "is-permitted": true + }, + { + "service-id": "vSalvatore", + "service-description": "vSalvatore", + "resource-version": "1494001900545", + "is-permitted": true + }, + { + "service-id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4", + "service-description": "Josefina", + "resource-version": "1494001941772", + "is-permitted": true + }, + { + "service-id": "vHubbard", + "service-description": "vHubbard", + "resource-version": "1494001988229", + "is-permitted": true + }, + { + "service-id": "12a96a9d-4b4c-4349-a950-fe1159602621", + "service-description": "DARREN MCGEE", + "resource-version": "1494001817126", + "is-permitted": true } - }, - "collectionResource": {}, - "configurations": {}, - "serviceProxies": {}, - "vfModules": {}, - "volumeGroups": {}, - "pnfs": {} + ] } diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubDetails.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubDetails.json index 0063a9d46..f2ce0870b 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubDetails.json +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubDetails.json @@ -1,12 +1,12 @@ { "global-customer-id": "e433710f-9217-458d-a79d-1c7aff376d89", - "subscriber-name": "USP VOICE", + "subscriber-name": "SILVIA ROBBINS", "subscriber-type": "INFRA", "resource-version": "1494001938080", "service-subscriptions": { "service-subscription": [ { - "service-type": "HOSTED COMMUNICATIONS", + "service-type": "DARREN MCGEE", "resource-version": "1494001920845", "service-instances": { "service-instance": [ @@ -472,6 +472,57 @@ ] }, "is-permitted": false + }, + { + "service-type":"TYLER SILVIA", + "resource-version":"1501700976809", + "service-instances":{ + "service-instance":[ + { + "service-instance-id": "c187e9fe-40c3-4862-b73e-84ff056205f61234", + "service-instance-name": "test_fabric_config", + "model-invariant-id": "12343f9e-3244-4d8f-a8e0-0e5d7a29eda9", + "model-version-id": "12344bb4-a416-4b4e-997e-0059973630b9", + "resource-version": "1500789244674", + "orchestration-status": "Assigned" + }, + { + "service-instance-id": "c187e9fe-40c3-4862-b73e-84ff056205f69000", + "service-instance-name": "test_fabric_config", + "model-invariant-id": "90003f9e-3244-4d8f-a8e0-0e5d7a29eda9", + "model-version-id": "90004bb4-a416-4b4e-997e-0059973630b9", + "resource-version": "1500789244674", + "orchestration-status": "Active" + }, + { + "service-instance-id": "c187e9fe-40c3-4862-b73e-84ff056205f61000", + "service-instance-name": "test_fabric_config", + "model-invariant-id": "10003f9e-3244-4d8f-a8e0-0e5d7a29eda9", + "model-version-id": "10004bb4-a416-4b4e-997e-0059973630b9", + "resource-version": "1500789244674", + "orchestration-status": "pendingdeLete" + }, + { + "service-instance-id": "c187e9fe-40c3-4862-b73e-84ff056205f65678", + "service-instance-name": "test_fabric_config", + "model-invariant-id": "12343f9e-3244-4d8f-a8e0-0e5d7a29eda9", + "model-version-id": "12344bb4-a416-4b4e-997e-0059973630b9", + "resource-version": "1500789244674", + "orchestration-status": "Created" + }, + { + "service-instance-id":"3f93c7cb-2fd0-4557-9514-e189b7b04f9d", + "service-instance-name":"usp_voice_inst", + "persona-model-id":null, + "persona-model-version":null, + "resource-version":"1502391806301", + "orchestration-status":"Active", + "model-invariant-id":"64dbe153-48c6-4d6f-95e7-12ff4cce9871", + "model-version-id":"4e8b6372-dea3-4028-81d0-16eba59c94fd" + } + ] + }, + "is-permitted":true } ] } diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForActiveFabricConfigService.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForActiveFabricConfigService.json new file mode 100644 index 000000000..38c76060e --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForActiveFabricConfigService.json @@ -0,0 +1,52 @@ +{ + "inventory-response-item": [ + { + "model-name": "0eOHz2Yh8WJcBYzKy0791234", + "service-instance": { + "service-instance-id": "c187e9fe-40c3-4862-b73e-84ff056205f69000", + "service-instance-name": "test_fabric_config" + }, + "extra-properties": {}, + "inventory-response-items": { + "inventory-response-item": [ + { + "model-name": "Fabric-Configuration-Instance", + "configuration": { + "configuration-id": "1-fabric-config-LB1113", + "configuration-name": "dummy_instance_1", + "configuration-type": "fabric-configuration-type-1", + "configuration-sub-type": "fabric-configuration-sub-type-1", + "model-invariant-id": "model-invariant-id-1", + "model-version-id": "model-version-id-1", + "orchestration-status": "Assigned", + "operational-status": "", + "configuration-selflink": "", + "model-customization-id": "model-customization-id-1", + "resource-version": "1504038855716" + }, + "extra-properties": { + } + }, + { + "model-name": "Fabric-Configuration-Instance", + "configuration": { + "configuration-id": "2-fabric-config-LB1113", + "configuration-name": "dummy_instance_2", + "configuration-type": "fabric-configuration-type-2", + "configuration-sub-type": "fabric-configuration-sub-type-2", + "model-invariant-id": "model-invariant-id-2", + "model-version-id": "model-version-id-2", + "orchestration-status": "Assigned", + "operational-status": "", + "configuration-selflink": "", + "model-customization-id": "model-customization-id-2", + "resource-version": "1504038855712" + }, + "extra-properties": { + } + } + ] + } + } + ] +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForComplexService.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForComplexService.json index 0706036a1..d6107b821 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForComplexService.json +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForComplexService.json @@ -90,14 +90,14 @@ "subnet-id": "1254dd9b-e689-4075-a089-f0deeb23c00c", "subnet-name": "APP-C-DND_vEPDG-FN_hsl_fn_net_1_subnet_1", "neutron-subnet-id": "7b5ea34d-fb95-4278-a148-4f6677ebe866", - "gateway-address": "107.243.49.1", - "network-start-address": "107.243.49.0", + "gateway-address": "10.0.0.10", + "network-start-address": "10.0.0.10", "cidr-mask": "26", "ip-version": "4", "orchestration-status": "Created", "dhcp-enabled": true, - "dhcp-start": "107.243.49.3", - "dhcp-end": "107.243.49.62", + "dhcp-start": "10.0.0.10", + "dhcp-end": "10.0.0.10", "ip-assignment-direction": "false", "resource-version": "1511279493791" }, diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForCreatedFabricConfigService.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForCreatedFabricConfigService.json new file mode 100644 index 000000000..0ad741cd7 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForCreatedFabricConfigService.json @@ -0,0 +1,52 @@ +{ + "inventory-response-item": [ + { + "model-name": "0eOHz2Yh8WJcBYzKy0791234", + "service-instance": { + "service-instance-id": "c187e9fe-40c3-4862-b73e-84ff056205f69000", + "service-instance-name": "test_fabric_config" + }, + "extra-properties": {}, + "inventory-response-items": { + "inventory-response-item": [ + { + "model-name": "Fabric-Configuration-Instance", + "configuration": { + "configuration-id": "1-fabric-config-LB1113", + "configuration-name": "dummy_instance_1", + "configuration-type": "fabric-configuration-type-1", + "configuration-sub-type": "fabric-configuration-sub-type-1", + "model-invariant-id": "model-invariant-id-1", + "model-version-id": "model-version-id-1", + "orchestration-status": "Active", + "operational-status": "", + "configuration-selflink": "", + "model-customization-id": "model-customization-id-1", + "resource-version": "1504038855716" + }, + "extra-properties": { + } + }, + { + "model-name": "Fabric-Configuration-Instance", + "configuration": { + "configuration-id": "2-fabric-config-LB1113", + "configuration-name": "dummy_instance_2", + "configuration-type": "fabric-configuration-type-2", + "configuration-sub-type": "fabric-configuration-sub-type-2", + "model-invariant-id": "model-invariant-id-2", + "model-version-id": "model-version-id-2", + "orchestration-status": "Assigned", + "operational-status": "", + "configuration-selflink": "", + "model-customization-id": "model-customization-id-2", + "resource-version": "1504038855712" + }, + "extra-properties": { + } + } + ] + } + } + ] +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForDeactivatedFabricConfigService.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForDeactivatedFabricConfigService.json new file mode 100644 index 000000000..b224e323f --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForDeactivatedFabricConfigService.json @@ -0,0 +1,52 @@ +{ + "inventory-response-item": [ + { + "model-name": "0eOHz2Yh8WJcBYzKy0791234", + "service-instance": { + "service-instance-id": "c187e9fe-40c3-4862-b73e-84ff056205f61000", + "service-instance-name": "test_fabric_config" + }, + "extra-properties": {}, + "inventory-response-items": { + "inventory-response-item": [ + { + "model-name": "Fabric-Configuration-Instance", + "configuration": { + "configuration-id": "1-fabric-config-LB1113", + "configuration-name": "dummy_instance_1", + "configuration-type": "fabric-configuration-type-1", + "configuration-sub-type": "fabric-configuration-sub-type-1", + "model-invariant-id": "model-invariant-id-1", + "model-version-id": "model-version-id-1", + "orchestration-status": "Active", + "operational-status": "", + "configuration-selflink": "", + "model-customization-id": "model-customization-id-1", + "resource-version": "1504038855716" + }, + "extra-properties": { + } + }, + { + "model-name": "Fabric-Configuration-Instance", + "configuration": { + "configuration-id": "2-fabric-config-LB1113", + "configuration-name": "dummy_instance_2", + "configuration-type": "fabric-configuration-type-2", + "configuration-sub-type": "fabric-configuration-sub-type-2", + "model-invariant-id": "model-invariant-id-2", + "model-version-id": "model-version-id-2", + "orchestration-status": "Assigned", + "operational-status": "", + "configuration-selflink": "", + "model-customization-id": "model-customization-id-2", + "resource-version": "1504038855712" + }, + "extra-properties": { + } + } + ] + } + } + ] +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForFabricConfigService.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForFabricConfigService.json new file mode 100644 index 000000000..ddd673b87 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForFabricConfigService.json @@ -0,0 +1,52 @@ +{ + "inventory-response-item": [ + { + "model-name": "0eOHz2Yh8WJcBYzKy0791234", + "service-instance": { + "service-instance-id": "c187e9fe-40c3-4862-b73e-84ff056205f61234", + "service-instance-name": "test_fabric_config" + }, + "extra-properties": {}, + "inventory-response-items": { + "inventory-response-item": [ + { + "model-name": "Fabric-Configuration-Instance", + "configuration": { + "configuration-id": "1-fabric-config-LB1113", + "configuration-name": "dummy_instance_1", + "configuration-type": "fabric-configuration-type-1", + "configuration-sub-type": "fabric-configuration-sub-type-1", + "model-invariant-id": "model-invariant-id-1", + "model-version-id": "model-version-id-1", + "orchestration-status": "Assigned", + "operational-status": "", + "configuration-selflink": "", + "model-customization-id": "model-customization-id-1", + "resource-version": "1504038855716" + }, + "extra-properties": { + } + }, + { + "model-name": "Fabric-Configuration-Instance", + "configuration": { + "configuration-id": "2-fabric-config-LB1113", + "configuration-name": "dummy_instance_2", + "configuration-type": "fabric-configuration-type-2", + "configuration-sub-type": "fabric-configuration-sub-type-2", + "model-invariant-id": "model-invariant-id-2", + "model-version-id": "model-version-id-2", + "orchestration-status": "Active", + "operational-status": "", + "configuration-selflink": "", + "model-customization-id": "model-customization-id-2", + "resource-version": "1504038855712" + }, + "extra-properties": { + } + } + ] + } + } + ] +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForServiceWithSomeVFModule.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForServiceWithSomeVFModule.json new file mode 100644 index 000000000..0a0de81a4 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/aaiSubViewEditForServiceWithSomeVFModule.json @@ -0,0 +1,355 @@ +{ + "inventory-response-item": [ + { + "model-name": "1707vidnf", + "service-instance": { + "service-instance-id": "3f93c7cb-2fd0-4557-9514-e189b7b04f9d", + "service-instance-name": "vid-test-444" + }, + "extra-properties": {}, + "inventory-response-items": { + "inventory-response-item": [ + { + "model-name": "VID-PCRF-05-15-17", + "generic-vnf": { + "vnf-id": "c015cc0f-0f37-4488-aabf-53795fd93cd3", + "vnf-name": "fsd", + "vnf-type": "1707vidnf/VID-PCRF-05-15-17 0", + "service-id": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e", + "prov-status": "PREPROV", + "orchestration-status": "Created", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1502299355826", + "model-invariant-id": "af94e0b5-454c-4fd8-b62b-ef27632afd22", + "model-version-id": "3d2657a7-6816-4662-93f0-26e315611336", + "model-customization-id": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7", + "nf-type": "null", + "nf-function": "null", + "nf-role": "null", + "nf-naming-code": "null" + }, + "extra-properties": {}, + "inventory-response-items": { + "inventory-response-item": [ + { + "volume-group": { + "volume-group-id": "d9db0900-31f6-4880-8658-8c996c6123b4", + "volume-group-name": "f", + "heat-stack-id": "", + "vnf-type": "1707vidnf/null", + "orchestration-status": "Pending", + "vf-module-model-customization-id": "a06b0a2b-0cb5-401c-bf29-b64bb6a114b9", + "resource-version": "1508048984071" + }, + "extra-properties": {} + }, + { + "model-name": "VidPcrf051517..pcrf_base_template_v3_0..module-0", + "vf-module": { + "vf-module-id": "f2805715-e24f-4c8a-9eb3-6c618da7691d", + "vf-module-name": "aa", + "orchestration-status": "pendingactivation", + "is-base-vf-module": true, + "resource-version": "1504770843380", + "model-invariant-id": "df35ebf5-880b-4052-b4dc-5fbf38a423ca", + "model-version-id": "bbf63386-42ec-4cae-a6a1-a8dade4e09e1", + "model-customization-id": "56f23f2a-de4b-4f72-a51c-439970350885", + "module-index": 0 + }, + "extra-properties": {} + }, + { + "model-name": "VidPcrf051517..pcrf_nimbus_pcm..module-4", + "vf-module": { + "vf-module-id": "f91515e5-cf8d-4abf-aacc-5bc5c5a47f09", + "vf-module-name": "gg", + "orchestration-status": "assiGned", + "is-base-vf-module": false, + "resource-version": "1504694876599", + "model-invariant-id": "eb5a1e09-7f46-4f1c-ab7a-b017bad95261", + "model-version-id": "fa1c8558-006c-4fb6-82f2-4fc0646d6b06", + "model-customization-id": "222bd8f2-341d-4419-aa0e-98398fa34050", + "module-index": 1 + }, + "extra-properties": {} + }, + { + "model-name": "VidPcrf051517..pcrf_nimbus_pcm..module-5", + "vf-module": { + "vf-module-id": "f91515e5-cf8d-4abf-aacc-5bc5c5a47f05", + "vf-module-name": "ABC", + "orchestration-status": "Created", + "is-base-vf-module": false, + "resource-version": "1504694876599", + "model-invariant-id": "eb5a1e09-7f46-4f1c-ab7a-b017bad95265", + "model-version-id": "fa1c8558-006c-4fb6-82f2-4fc0646d6b05", + "model-customization-id": "222bd8f2-341d-4419-aa0e-98398fa34055", + "module-index": 1 + }, + "extra-properties": {} + }, + { + "model-name": "VidPcrf051517..pcrf_nimbus_pcm..module-4", + "vf-module": { + "vf-module-id": "a231a99c-7e75-4d6d-a0fb-5c7d26f30f77", + "vf-module-name": "my_vfModule", + "orchestration-status": "pending-delete", + "is-base-vf-module": false, + "resource-version": "1505044772033", + "model-invariant-id": "eb5a1e09-7f46-4f1c-ab7a-b017bad95261", + "model-version-id": "fa1c8558-006c-4fb6-82f2-4fc0646d6b06", + "model-customization-id": "222bd8f2-341d-4419-aa0e-98398fa34050", + "module-index": 0 + }, + "extra-properties": {} + } + ] + } + }, + { + "model-name": "VID-PCRF-05-15-17", + "generic-vnf": { + "vnf-id": "0846287b-65bf-45a6-88f6-6a1af4149fac", + "vnf-name": "kjkjk", + "vnf-type": "1707vidnf/VID-PCRF-05-15-17 0", + "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "prov-status": "PREPROV", + "orchestration-status": "Created", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1504008534044", + "model-invariant-id": "af94e0b5-454c-4fd8-b62b-ef27632afd22", + "model-version-id": "3d2657a7-6816-4662-93f0-26e315611336", + "model-customization-id": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7", + "nf-type": "", + "nf-function": "", + "nf-role": "", + "nf-naming-code": "" + }, + "extra-properties": {}, + "inventory-response-items": { + "inventory-response-item": [ + { + "volume-group": { + "volume-group-id": "973cb0a6-f0b5-4a45-b995-db265bda182c", + "volume-group-name": "fdgfg", + "heat-stack-id": "", + "vnf-type": "1707vidnf/null", + "orchestration-status": "Pending", + "vf-module-model-customization-id": "a06b0a2b-0cb5-401c-bf29-b64bb6a114b9", + "resource-version": "1508413877324" + }, + "extra-properties": {} + }, + { + "volume-group": { + "volume-group-id": "09203a8b-29e7-4e76-8dd0-565f6a081f82", + "volume-group-name": "fdgfd", + "heat-stack-id": "", + "vnf-type": "1707vidnf/null", + "orchestration-status": "Pending", + "vf-module-model-customization-id": "a06b0a2b-0cb5-401c-bf29-b64bb6a114b9", + "resource-version": "1508413828948" + }, + "extra-properties": {} + }, + { + "model-name": "VidPcrf051517..pcrf_nimbus_pcm..module-4", + "vf-module": { + "vf-module-id": "a9b70ac0-5917-4203-a308-0e6920e6d09b", + "vf-module-name": "vf_module2", + "orchestration-status": "PendingCreate", + "is-base-vf-module": false, + "resource-version": "1504694397912", + "model-invariant-id": "eb5a1e09-7f46-4f1c-ab7a-b017bad95261", + "model-version-id": "fa1c8558-006c-4fb6-82f2-4fc0646d6b06", + "model-customization-id": "222bd8f2-341d-4419-aa0e-98398fa34050", + "module-index": 0 + }, + "extra-properties": {} + } + ] + } + }, + { + "model-name": "VID-PCRF-05-15-17", + "generic-vnf": { + "vnf-id": "9908b762-136f-4b1f-8eb4-ef670ef58bb4", + "vnf-name": "uiui", + "vnf-type": "1707vidnf/VID-PCRF-05-15-17 0", + "service-id": "vRosemarie", + "prov-status": "PREPROV", + "orchestration-status": "Created", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1504516218649", + "model-invariant-id": "af94e0b5-454c-4fd8-b62b-ef27632afd22", + "model-version-id": "3d2657a7-6816-4662-93f0-26e315611336", + "model-customization-id": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7", + "nf-type": "", + "nf-function": "", + "nf-role": "", + "nf-naming-code": "" + }, + "extra-properties": {} + }, + { + "model-name": "VID-PCRF-05-15-17", + "generic-vnf": { + "vnf-id": "543931f5-e50e-45a2-a69f-ab727e4c7f2f", + "vnf-name": "sdfsdfdsf", + "vnf-type": "1707vidnf/VID-PCRF-05-15-17 0", + "service-id": "LRSI-OSPF", + "prov-status": "PREPROV", + "orchestration-status": "Created", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1506509961062", + "model-invariant-id": "af94e0b5-454c-4fd8-b62b-ef27632afd22", + "model-version-id": "3d2657a7-6816-4662-93f0-26e315611336", + "model-customization-id": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7", + "nf-type": "", + "nf-function": "", + "nf-role": "", + "nf-naming-code": "" + }, + "extra-properties": {} + }, + { + "model-name": "VID-PCRF-05-15-17", + "generic-vnf": { + "vnf-id": "25e84884-22d5-44c9-8212-cb459f63e0ba", + "vnf-name": "sdada", + "vnf-type": "1707vidnf/VID-PCRF-05-15-17 0", + "service-id": "Cisneros", + "prov-status": "PREPROV", + "orchestration-status": "Created", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1506509479125", + "model-invariant-id": "af94e0b5-454c-4fd8-b62b-ef27632afd22", + "model-version-id": "3d2657a7-6816-4662-93f0-26e315611336", + "model-customization-id": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7", + "nf-type": "", + "nf-function": "", + "nf-role": "", + "nf-naming-code": "" + }, + "extra-properties": {} + }, + { + "model-name": "VID-PCRF-05-15-17", + "generic-vnf": { + "vnf-id": "013fb0ba-977b-496c-9faa-7f8e5f083eec", + "vnf-name": "gvb", + "vnf-type": "1707vidnf/VID-PCRF-05-15-17 0", + "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "prov-status": "PREPROV", + "orchestration-status": "Created", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1508048678134", + "model-invariant-id": "af94e0b5-454c-4fd8-b62b-ef27632afd22", + "model-version-id": "3d2657a7-6816-4662-93f0-26e315611336", + "model-customization-id": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7", + "nf-type": "", + "nf-function": "", + "nf-role": "", + "nf-naming-code": "" + }, + "extra-properties": {} + }, + { + "model-name": "VID-PCRF-05-15-17", + "generic-vnf": { + "vnf-id": "06914296-cb46-4b62-9453-329a706a6cbb", + "vnf-name": "lkllll", + "vnf-type": "1707vidnf/VID-PCRF-05-15-17 0", + "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "prov-status": "PREPROV", + "orchestration-status": "Created", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1504507099829", + "model-invariant-id": "af94e0b5-454c-4fd8-b62b-ef27632afd22", + "model-version-id": "3d2657a7-6816-4662-93f0-26e315611336", + "model-customization-id": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7", + "nf-type": "", + "nf-function": "", + "nf-role": "", + "nf-naming-code": "" + }, + "extra-properties": {} + }, + { + "model-name": "VID-PCRF-05-15-17", + "generic-vnf": { + "vnf-id": "c55da606-cf38-42c7-bc3c-be8e23b19299", + "vnf-name": "ss", + "vnf-type": "1707vidnf/VID-PCRF-05-15-17 0", + "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "prov-status": "PREPROV", + "orchestration-status": "Created", + "in-maint": false, + "is-closed-loop-disabled": false, + "resource-version": "1508048827342", + "model-invariant-id": "af94e0b5-454c-4fd8-b62b-ef27632afd22", + "model-version-id": "3d2657a7-6816-4662-93f0-26e315611336", + "model-customization-id": "d279139c-4b85-48ff-8ac4-9b83a6fc6da7", + "nf-type": "", + "nf-function": "", + "nf-role": "", + "nf-naming-code": "" + }, + "extra-properties": {} + }, + { + "l3-network": { + "network-id": "6adc05e4-85c6-4f91-aa5a-1eb9546c4369", + "network-name": "APP-C-DND_vEPDG-FN_hsl_fn_net_1", + "network-type": "CONTRAIL30_BASIC", + "network-role": "hsl", + "network-technology": "contrail", + "neutron-network-id": "41a61725-f623-4166-bc84-e76a219cca9d", + "is-bound-to-vpn": false, + "service-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "network-role-instance": 0, + "resource-version": "1511279493784", + "orchestration-status": "Created", + "heat-stack-id": "APP-C-DND_vEPDG-FN_hsl_fn_net_1/af134fb1-8ce3-4d41-88d9-8a83f5f79776", + "contrail-network-fqdn": "default-domain:APP-C-DND:APP-C-DND_vEPDG-FN_hsl_fn_net_1", + "physical-network-name": "leave blank", + "is-provider-network": false, + "is-shared-network": true, + "is-external-network": false + }, + "extra-properties": {}, + "inventory-response-items": { + "inventory-response-item": [ + { + "subnet": { + "subnet-id": "1254dd9b-e689-4075-a089-f0deeb23c00c", + "subnet-name": "APP-C-DND_vEPDG-FN_hsl_fn_net_1_subnet_1", + "neutron-subnet-id": "7b5ea34d-fb95-4278-a148-4f6677ebe866", + "gateway-address": "10.0.0.10", + "network-start-address": "10.0.0.10", + "cidr-mask": "26", + "ip-version": "4", + "orchestration-status": "Created", + "dhcp-enabled": true, + "dhcp-start": "10.0.0.10", + "dhcp-end": "10.0.0.10", + "ip-assignment-direction": "false", + "resource-version": "1511279493791" + }, + "extra-properties": {} + } + ] + } + } + ] + } + } + ] +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/activeFabricConfigService.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/activeFabricConfigService.json new file mode 100644 index 000000000..f98a8d49a --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/activeFabricConfigService.json @@ -0,0 +1,51 @@ +{ + "service": { + "uuid": "56784bb4-a416-4b4e-997e-0059973630b9", + "invariantUuid": "56783f9e-3244-4d8f-a8e0-0e5d7a29eda9", + "name": "ADIOD vMX vPE_BV Service 488", + "version": "1.0", + "toscaModelURL": null, + "category": "Network L1-3", + "serviceType": "", + "serviceRole": "", + "description": "ADIOD vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM", + "serviceEcompNaming": "true", + "instantiationType": "ClientConfig", + "inputs": { + + } + }, + "vnfs": { + + }, + "networks": { + + }, + "collectionResource": {}, + "configurations": { + + }, + "fabricConfigurations": { + "Fabric Configuration 0": { + "invariantUuid" : "1608eef4-de53-4334-a8d2-ba79cab4bddd", + "uuid": "88379cfd-fa0f-4946-8958-acc32640ceee", + "customizationUuid": "1e7f6512-c1cf-4b96-b5f5-b22a212ddad0", + "version": "3.0", + "name": "Fabric Configuration Object", + "description": "Fabric Configuration Object", + "type": "Configuration" + } + }, + "serviceProxies": { + + }, + "vfModules": { + + }, + "volumeGroups": { + + }, + "pnfs": { + + } +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json index f9d4d0661..317c046ff 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/asyncInstantiation.json @@ -3,6 +3,7 @@ "id": 8, "created": 1525075968000, "modified": 1525075971000, + "action": "INSTANTIATE", "createdId": null, "modifiedId": null, "rowNum": null, @@ -11,32 +12,36 @@ "jobId": "5c2cd8e5-27d0-42e3-85a1-85db5eaba459", "templateId": "d42ba7c8-9e19-4e34-ae2c-d8af3f24498e", "userId": "16807000", + "aLaCarte": false, + "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d9c", "jobStatus": "FAILED", "statusModifiedDate": 1525075968000, "hidden": false, "pause": false, "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", - "owningEntityName": "MetroPacketCore", - "project": "DFW", + "owningEntityName": "WayneHolland", + "project": "WATKINS", "aicZoneId": "NFT1", "aicZoneName": "NFTJSSSS-NFT1", "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", - "tenantName": "AIN Web Tool-15-D-testgamma", - "regionId": "mtn6", + "tenantName": "AIN Web Tool-15-D-testalexandria", + "regionId": "hvf6", "regionName": null, - "serviceType": "VIRTUAL USP", + "serviceType": "TYLER SILVIA", "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89", "serviceInstanceId": null, "serviceInstanceName": "nWUfl instance name_002", "serviceModelId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", "serviceModelName": "action-data", "serviceModelVersion": "1.0", - "createdBulkDate": 1525075968000 + "createdBulkDate": 1525075968000, + "isRetryEnabled": true }, { "id": 7, "created": 1525075968000, "modified": 1525075971000, + "action": "INSTANTIATE", "createdId": null, "modifiedId": null, "rowNum": null, @@ -45,32 +50,36 @@ "jobId": "13063a83-924e-4500-a3a1-e53d1b58450b", "templateId": "d42ba7c8-9e19-4e34-ae2c-d8af3f24498e", "userId": "16807000", + "aLaCarte": false, + "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d9d", "jobStatus": "IN_PROGRESS", "statusModifiedDate": 1525075968000, "hidden": false, "pause": false, "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", - "owningEntityName": "MetroPacketCore", - "project": "DFW", + "owningEntityName": "WayneHolland", + "project": "WATKINS", "aicZoneId": "NFT1", "aicZoneName": "NFTJSSSS-NFT1", "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", - "tenantName": "AIN Web Tool-15-D-testgamma", - "regionId": "mtn6", + "tenantName": "AIN Web Tool-15-D-testalexandria", + "regionId": "hvf6", "regionName": null, - "serviceType": "VIRTUAL USP", + "serviceType": "TYLER SILVIA", "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89", "serviceInstanceId": null, "serviceInstanceName": "nWUfl instance name_001", "serviceModelId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", "serviceModelName": "action-data", "serviceModelVersion": "1.0", - "createdBulkDate": 1525075968000 + "createdBulkDate": 1525075968000, + "isRetryEnabled": false }, { "id": 6, "created": 1525007432000, "modified": 1525007434000, + "action": "INSTANTIATE", "createdId": null, "modifiedId": null, "rowNum": null, @@ -79,6 +88,8 @@ "jobId": "e1db03c3-6274-4ff7-84cf-7bd3a3946de7", "templateId": "cad41760-8653-4c5a-a5fd-8ee34780ae69", "userId": "16807000", + "aLaCarte": false, + "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d8e", "jobStatus": "FAILED", "statusModifiedDate": 1525007432000, "hidden": false, @@ -99,12 +110,14 @@ "serviceModelId": "300adb1e-9b0c-4d52-bfb5-fa5393c4eabb", "serviceModelName": "AIM_TRANSPORT_00004", "serviceModelVersion": "1.0", - "createdBulkDate": 1525007432000 + "createdBulkDate": 1525007432000, + "isRetryEnabled": false }, { "id": 5, "created": 1524995555000, "modified": 1524995556000, + "action": "INSTANTIATE", "createdId": null, "modifiedId": null, "rowNum": null, @@ -113,32 +126,36 @@ "jobId": "9f88fdb5-bb47-4bf3-8c5f-98f1ad0ec87c", "templateId": "ce4ec177-cfc8-483e-8a2c-b7aea53fd740", "userId": "16807000", + "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d91", + "requestId": null, "jobStatus": "FAILED", "statusModifiedDate": 1524995555000, "hidden": false, "pause": false, "owningEntityId": "aaa1", "owningEntityName": "aaa1", - "project": "DFW", + "project": "WATKINS", "aicZoneId": "BAN1", "aicZoneName": "VSDKYUTP-BAN1", "tenantId": "1178612d2b394be4834ad77f567c0af2", "tenantName": "AIN Web Tool-15-D-SSPtestcustome", - "regionId": "mtn6", + "regionId": "hvf6", "regionName": null, - "serviceType": "VIRTUAL USP", + "serviceType": "TYLER SILVIA", "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89", "serviceInstanceId": null, "serviceInstanceName": null, "serviceModelId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", "serviceModelName": "ComplexService", "serviceModelVersion": "1.0", - "createdBulkDate": 1524995555000 + "createdBulkDate": 1524995555000, + "isRetryEnabled": false }, { "id": 4, "created": 1524994349000, "modified": 1524994350000, + "action": "INSTANTIATE", "createdId": null, "modifiedId": null, "rowNum": null, @@ -147,32 +164,36 @@ "jobId": "b73b1543-fa12-4ad5-8ef5-49f02eb33698", "templateId": "79af00c6-4712-432a-8989-b6419c8baa40", "userId": "16807000", + "aLaCarte": true, + "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d94", "jobStatus": "FAILED", "statusModifiedDate": 1524994349000, "hidden": false, "pause": false, "owningEntityId": "aaa1", "owningEntityName": "aaa1", - "project": "DFW", + "project": "WATKINS", "aicZoneId": null, "aicZoneName": null, "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e", "tenantName": "AIN Web Tool-15-D-STTest2", - "regionId": "mtn6", + "regionId": "hvf6", "regionName": null, - "serviceType": "VIRTUAL USP", + "serviceType": "TYLER SILVIA", "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89", "serviceInstanceId": null, "serviceInstanceName": null, "serviceModelId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", "serviceModelName": "ComplexService", "serviceModelVersion": "1.0", - "createdBulkDate": 1524994349000 + "createdBulkDate": 1524994349000, + "isRetryEnabled": false }, { "id": 3, "created": 1524991828000, "modified": 1524991830000, + "action": "INSTANTIATE", "createdId": null, "modifiedId": null, "rowNum": null, @@ -181,32 +202,36 @@ "jobId": "725ef127-4ee5-4665-bdf1-55ee342b362f", "templateId": "6bd53c0d-8742-43f6-9ed2-efbb87062779", "userId": "16807000", + "aLaCarte": true, + "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d96", "jobStatus": "FAILED", "statusModifiedDate": 1524991828000, "hidden": false, "pause": false, "owningEntityId": "aaa1", "owningEntityName": "aaa1", - "project": "DFW", + "project": "WATKINS", "aicZoneId": "NFT1", "aicZoneName": "NFTJSSSS-NFT1", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "tenantName": "USP-SIP-IC-24335-T-01", - "regionId": "AAIAIC25", + "regionId": "JANET25", "regionName": null, - "serviceType": "VIRTUAL USP", + "serviceType": "TYLER SILVIA", "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89", "serviceInstanceId": null, "serviceInstanceName": null, "serviceModelId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", "serviceModelName": "ComplexService", "serviceModelVersion": "1.0", - "createdBulkDate": 1524991828000 + "createdBulkDate": 1524991828000, + "isRetryEnabled": false }, { "id": 2, "created": 1524663233000, "modified": 1524663236000, + "action": "INSTANTIATE", "createdId": null, "modifiedId": null, "rowNum": null, @@ -215,32 +240,36 @@ "jobId": "b1ff271b-829a-43f9-a2e3-23987a34f261", "templateId": "262fccc5-cae9-4258-b522-540c4010e0a9", "userId": "16807000", + "aLaCarte": true, + "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d98", "jobStatus": "FAILED", "statusModifiedDate": 1524663233000, "hidden": false, "pause": false, "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", - "owningEntityName": "MetroPacketCore", - "project": "DFW", + "owningEntityName": "WayneHolland", + "project": "WATKINS", "aicZoneId": "NFT1", "aicZoneName": "NFTJSSSS-NFT1", "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", - "tenantName": "AIN Web Tool-15-D-testgamma", - "regionId": "mtn6", + "tenantName": "AIN Web Tool-15-D-testalexandria", + "regionId": "hvf6", "regionName": null, - "serviceType": "VIRTUAL USP", + "serviceType": "TYLER SILVIA", "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89", "serviceInstanceId": null, "serviceInstanceName": "sPenLiZXXpqzsVck instance name_02", "serviceModelId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", "serviceModelName": "action-data", "serviceModelVersion": "1.0", - "createdBulkDate": 1524663233000 + "createdBulkDate": 1524663233000, + "isRetryEnabled": true }, { "id": 1, "created": 1524663233000, "modified": 1524663236000, + "action": "INSTANTIATE", "createdId": null, "modifiedId": null, "rowNum": null, @@ -249,26 +278,104 @@ "jobId": "850dc7d2-5240-437f-9bcd-b1ed7dc339ca", "templateId": "262fccc5-cae9-4258-b522-540c4010e0a9", "userId": "16807000", + "aLaCarte": true, + "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d45", "jobStatus": "IN_PROGRESS", "statusModifiedDate": 1524663233000, "hidden": false, "pause": false, "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", - "owningEntityName": "MetroPacketCore", - "project": "DFW", + "owningEntityName": "WayneHolland", + "project": "WATKINS", "aicZoneId": "NFT1", "aicZoneName": "NFTJSSSS-NFT1", "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", - "tenantName": "AIN Web Tool-15-D-testgamma", - "regionId": "mtn6", + "tenantName": "AIN Web Tool-15-D-testalexandria", + "regionId": "hvf6", "regionName": null, - "serviceType": "VIRTUAL USP", + "serviceType": "TYLER SILVIA", "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89", "serviceInstanceId": null, "serviceInstanceName": "sPenLiZXXpqzsVck instance name_01", "serviceModelId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", "serviceModelName": "action-data", "serviceModelVersion": "1.0", - "createdBulkDate": 1524663233000 - } + "createdBulkDate": 1524663233000, + "isRetryEnabled": false + }, + { + "id": 9, + "created": 1524663233000, + "modified": 1524663236000, + "action": "DELETE", + "createdId": null, + "modifiedId": null, + "rowNum": null, + "auditUserId": null, + "auditTrail": null, + "jobId": "850dc7d2-5240-437f-9bcd-b1ed7dc339c2", + "templateId": "262fccc5-cae9-4258-b522-540c4010e0a9", + "userId": "16807000", + "aLaCarte": true, + "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d45", + "jobStatus": "IN_PROGRESS", + "statusModifiedDate": 1524663233000, + "hidden": false, + "pause": false, + "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "owningEntityName": "WayneHolland", + "project": "WATKINS", + "aicZoneId": "NFT1", + "aicZoneName": "NFTJSSSS-NFT1", + "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", + "tenantName": "AIN Web Tool-15-D-testalexandria", + "regionId": "hvf6", + "regionName": null, + "serviceType": "TYLER SILVIA", + "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89", + "serviceInstanceId": null, + "serviceInstanceName": "sPenLiZXXpqzsVck instance name_01", + "serviceModelId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "serviceModelName": "action-data", + "serviceModelVersion": "1.0", + "createdBulkDate": 1524663233000, + "isRetryEnabled": false +}, + { + "id": 10, + "created": 1524663233000, + "modified": 1524663236000, + "action": "UPDATE", + "createdId": null, + "modifiedId": null, + "rowNum": null, + "auditUserId": null, + "auditTrail": null, + "jobId": "850dc7d2-5240-437f-9bcd-b1ed7dc339c1", + "templateId": "262fccc5-cae9-4258-b522-540c4010e0a9", + "userId": "16807000", + "aLaCarte": true, + "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d45", + "jobStatus": "COMPLETED", + "statusModifiedDate": 1524663233000, + "hidden": false, + "pause": false, + "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "owningEntityName": "WayneHolland", + "project": "WATKINS", + "aicZoneId": "NFT1", + "aicZoneName": "NFTJSSSS-NFT1", + "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", + "tenantName": "AIN Web Tool-15-D-testalexandria", + "regionId": "hvf6", + "regionName": null, + "serviceType": "TYLER SILVIA", + "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89", + "serviceInstanceId": null, + "serviceInstanceName": "sPenLiZXXpqzsVck instance name_01", + "serviceModelId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "serviceModelName": "action-data", + "serviceModelVersion": "1.0", + "createdBulkDate": 1524663233000 +} ] diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicAsyncInstantiation.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicAsyncInstantiation.json index f9d4d0661..744013a9a 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicAsyncInstantiation.json +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicAsyncInstantiation.json @@ -3,6 +3,7 @@ "id": 8, "created": 1525075968000, "modified": 1525075971000, + "action": "INSTANTIATE", "createdId": null, "modifiedId": null, "rowNum": null, @@ -11,20 +12,22 @@ "jobId": "5c2cd8e5-27d0-42e3-85a1-85db5eaba459", "templateId": "d42ba7c8-9e19-4e34-ae2c-d8af3f24498e", "userId": "16807000", + "aLaCarte": false, + "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d9c", "jobStatus": "FAILED", "statusModifiedDate": 1525075968000, "hidden": false, "pause": false, "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", - "owningEntityName": "MetroPacketCore", - "project": "DFW", + "owningEntityName": "WayneHolland", + "project": "WATKINS", "aicZoneId": "NFT1", "aicZoneName": "NFTJSSSS-NFT1", "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", - "tenantName": "AIN Web Tool-15-D-testgamma", - "regionId": "mtn6", + "tenantName": "AIN Web Tool-15-D-testalexandria", + "regionId": "hvf6", "regionName": null, - "serviceType": "VIRTUAL USP", + "serviceType": "TYLER SILVIA", "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89", "serviceInstanceId": null, "serviceInstanceName": "nWUfl instance name_002", @@ -37,6 +40,7 @@ "id": 7, "created": 1525075968000, "modified": 1525075971000, + "action": "INSTANTIATE", "createdId": null, "modifiedId": null, "rowNum": null, @@ -45,20 +49,22 @@ "jobId": "13063a83-924e-4500-a3a1-e53d1b58450b", "templateId": "d42ba7c8-9e19-4e34-ae2c-d8af3f24498e", "userId": "16807000", + "aLaCarte": false, + "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d9d", "jobStatus": "IN_PROGRESS", "statusModifiedDate": 1525075968000, "hidden": false, "pause": false, "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", - "owningEntityName": "MetroPacketCore", - "project": "DFW", + "owningEntityName": "WayneHolland", + "project": "WATKINS", "aicZoneId": "NFT1", "aicZoneName": "NFTJSSSS-NFT1", "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", - "tenantName": "AIN Web Tool-15-D-testgamma", - "regionId": "mtn6", + "tenantName": "AIN Web Tool-15-D-testalexandria", + "regionId": "hvf6", "regionName": null, - "serviceType": "VIRTUAL USP", + "serviceType": "TYLER SILVIA", "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89", "serviceInstanceId": null, "serviceInstanceName": "nWUfl instance name_001", @@ -71,6 +77,7 @@ "id": 6, "created": 1525007432000, "modified": 1525007434000, + "action": "INSTANTIATE", "createdId": null, "modifiedId": null, "rowNum": null, @@ -79,6 +86,8 @@ "jobId": "e1db03c3-6274-4ff7-84cf-7bd3a3946de7", "templateId": "cad41760-8653-4c5a-a5fd-8ee34780ae69", "userId": "16807000", + "aLaCarte": false, + "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d8e", "jobStatus": "FAILED", "statusModifiedDate": 1525007432000, "hidden": false, @@ -105,6 +114,7 @@ "id": 5, "created": 1524995555000, "modified": 1524995556000, + "action": "INSTANTIATE", "createdId": null, "modifiedId": null, "rowNum": null, @@ -113,20 +123,22 @@ "jobId": "9f88fdb5-bb47-4bf3-8c5f-98f1ad0ec87c", "templateId": "ce4ec177-cfc8-483e-8a2c-b7aea53fd740", "userId": "16807000", + "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d91", + "requestId": null, "jobStatus": "FAILED", "statusModifiedDate": 1524995555000, "hidden": false, "pause": false, "owningEntityId": "aaa1", "owningEntityName": "aaa1", - "project": "DFW", + "project": "WATKINS", "aicZoneId": "BAN1", "aicZoneName": "VSDKYUTP-BAN1", "tenantId": "1178612d2b394be4834ad77f567c0af2", "tenantName": "AIN Web Tool-15-D-SSPtestcustome", - "regionId": "mtn6", + "regionId": "hvf6", "regionName": null, - "serviceType": "VIRTUAL USP", + "serviceType": "TYLER SILVIA", "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89", "serviceInstanceId": null, "serviceInstanceName": null, @@ -139,6 +151,7 @@ "id": 4, "created": 1524994349000, "modified": 1524994350000, + "action": "INSTANTIATE", "createdId": null, "modifiedId": null, "rowNum": null, @@ -147,20 +160,22 @@ "jobId": "b73b1543-fa12-4ad5-8ef5-49f02eb33698", "templateId": "79af00c6-4712-432a-8989-b6419c8baa40", "userId": "16807000", + "aLaCarte": true, + "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d94", "jobStatus": "FAILED", "statusModifiedDate": 1524994349000, "hidden": false, "pause": false, "owningEntityId": "aaa1", "owningEntityName": "aaa1", - "project": "DFW", + "project": "WATKINS", "aicZoneId": null, "aicZoneName": null, "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e", "tenantName": "AIN Web Tool-15-D-STTest2", - "regionId": "mtn6", + "regionId": "hvf6", "regionName": null, - "serviceType": "VIRTUAL USP", + "serviceType": "TYLER SILVIA", "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89", "serviceInstanceId": null, "serviceInstanceName": null, @@ -173,6 +188,7 @@ "id": 3, "created": 1524991828000, "modified": 1524991830000, + "action": "INSTANTIATE", "createdId": null, "modifiedId": null, "rowNum": null, @@ -181,20 +197,22 @@ "jobId": "725ef127-4ee5-4665-bdf1-55ee342b362f", "templateId": "6bd53c0d-8742-43f6-9ed2-efbb87062779", "userId": "16807000", + "aLaCarte": true, + "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d96", "jobStatus": "FAILED", "statusModifiedDate": 1524991828000, "hidden": false, "pause": false, "owningEntityId": "aaa1", "owningEntityName": "aaa1", - "project": "DFW", + "project": "WATKINS", "aicZoneId": "NFT1", "aicZoneName": "NFTJSSSS-NFT1", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "tenantName": "USP-SIP-IC-24335-T-01", - "regionId": "AAIAIC25", + "regionId": "JANET25", "regionName": null, - "serviceType": "VIRTUAL USP", + "serviceType": "TYLER SILVIA", "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89", "serviceInstanceId": null, "serviceInstanceName": null, @@ -207,6 +225,7 @@ "id": 2, "created": 1524663233000, "modified": 1524663236000, + "action": "INSTANTIATE", "createdId": null, "modifiedId": null, "rowNum": null, @@ -215,20 +234,22 @@ "jobId": "b1ff271b-829a-43f9-a2e3-23987a34f261", "templateId": "262fccc5-cae9-4258-b522-540c4010e0a9", "userId": "16807000", + "aLaCarte": true, + "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d98", "jobStatus": "FAILED", "statusModifiedDate": 1524663233000, "hidden": false, "pause": false, "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", - "owningEntityName": "MetroPacketCore", - "project": "DFW", + "owningEntityName": "WayneHolland", + "project": "WATKINS", "aicZoneId": "NFT1", "aicZoneName": "NFTJSSSS-NFT1", "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", - "tenantName": "AIN Web Tool-15-D-testgamma", - "regionId": "mtn6", + "tenantName": "AIN Web Tool-15-D-testalexandria", + "regionId": "hvf6", "regionName": null, - "serviceType": "VIRTUAL USP", + "serviceType": "TYLER SILVIA", "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89", "serviceInstanceId": null, "serviceInstanceName": "sPenLiZXXpqzsVck instance name_02", @@ -241,6 +262,7 @@ "id": 1, "created": 1524663233000, "modified": 1524663236000, + "action": "INSTANTIATE", "createdId": null, "modifiedId": null, "rowNum": null, @@ -249,20 +271,22 @@ "jobId": "850dc7d2-5240-437f-9bcd-b1ed7dc339ca", "templateId": "262fccc5-cae9-4258-b522-540c4010e0a9", "userId": "16807000", + "aLaCarte": true, + "msoRequestId": "c0011670-0e1a-4b74-945d-8bf5aede1d45", "jobStatus": "IN_PROGRESS", "statusModifiedDate": 1524663233000, "hidden": false, "pause": false, "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", - "owningEntityName": "MetroPacketCore", - "project": "DFW", + "owningEntityName": "WayneHolland", + "project": "WATKINS", "aicZoneId": "NFT1", "aicZoneName": "NFTJSSSS-NFT1", "tenantId": "bae71557c5bb4d5aac6743a4e5f1d054", - "tenantName": "AIN Web Tool-15-D-testgamma", - "regionId": "mtn6", + "tenantName": "AIN Web Tool-15-D-testalexandria", + "regionId": "hvf6", "regionName": null, - "serviceType": "VIRTUAL USP", + "serviceType": "TYLER SILVIA", "subscriberName": "e433710f-9217-458d-a79d-1c7aff376d89", "serviceInstanceId": null, "serviceInstanceName": "sPenLiZXXpqzsVck instance name_01", diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicFabricConfigService.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicFabricConfigService.json new file mode 100644 index 000000000..46989e143 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicFabricConfigService.json @@ -0,0 +1,51 @@ +{ + "service": { + "uuid": "12344bb4-a416-4b4e-997e-0059973630b9", + "invariantUuid": "12343f9e-3244-4d8f-a8e0-0e5d7a29eda9", + "name": "ADIOD vMX vPE_BV Service 488", + "version": "1.0", + "toscaModelURL": null, + "category": "Network L1-3", + "serviceType": "", + "serviceRole": "", + "description": "ADIOD vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM", + "serviceEcompNaming": "true", + "instantiationType": "ClientConfig", + "inputs": { + + } + }, + "vnfs": { + + }, + "networks": { + + }, + "collectionResource": {}, + "configurations": { + + }, + "fabricConfigurations": { + "Fabric Configuration 0": { + "invariantUuid" : "1608eef4-de53-4334-a8d2-ba79cab4bddd", + "uuid": "88379cfd-fa0f-4946-8958-acc32640ceee", + "customizationUuid": "1e7f6512-c1cf-4b96-b5f5-b22a212ddad0", + "version": "3.0", + "name": "Fabric Configuration Object", + "description": "Fabric Configuration Object", + "type": "Configuration" + } + }, + "serviceProxies": { + + }, + "vfModules": { + + }, + "volumeGroups": { + + }, + "pnfs": { + + } +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicNetworkInstance.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicNetworkInstance.json new file mode 100644 index 000000000..3f85c89b5 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicNetworkInstance.json @@ -0,0 +1,73 @@ +{ + "networks": { + "ExtVL 0": { + "rollbackOnFailure": "false", + "productFamilyId": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e", + "lcpCloudRegionId": "hvf6", + "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e", + "lineOfBusiness": "zzz1", + "platformName": "platform", + "originalName": "ExtVL 0", + "modelInfo": { + "modelInvariantId": "379f816b-a7aa-422f-be30-17114ff50b7c", + "modelVersionId": "ddc3f20c-08b5-40fd-af72-c6d14636b986", + "modelName": "ExtVL", + "modelVersion": "37.0", + "modelType": "network", + "modelCustomizationId": "94fdd893-4a36-4d70-b16a-ec29c54c184f", + "modelCustomizationName": "ExtVL 0" + }, + "instanceName": "ExtVL 0", + "instanceId": "NETWORK_INSTANCE_ID", + "action": "None" + } + }, + "vnfs": {}, + "instanceParams": [ + { + "2017488_adiodvpe0_ASN": "AV_vPE" + } + ], + "validationCounter": 0, + "existingNames": { + "123": "", + "instancename": "", + "yoav": "" + }, + "existingVNFCounterMap": {}, + "existingNetworksCounterMap": {}, + "instanceName": "InstanceName", + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "subscriptionServiceType": "TYLER SILVIA", + "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "productFamilyId": "17cc1042-527b-11e6-beb8-9e71128cae77", + "lcpCloudRegionId": "JANET25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "aicZoneId": "JAG1", + "projectName": "WATKINS", + "rollbackOnFailure": "true", + "aicZoneName": "YUDFJULP-JAG1", + "owningEntityName": "WayneHolland", + "testApi": "GR_API", + "tenantName": "USP-SIP-IC-24335-T-01", + "bulkSize": 1, + "modelInfo": { + "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "modelVersionId": "6b528779-44a3-4472-bdff-9cd15ec93450", + "modelName": "action-data", + "modelVersion": "1.0", + "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450" + }, + "isALaCarte": true, + "name": "action-data", + "version": "1.0", + "description": "", + "category": "", + "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450", + "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "serviceType": "", + "serviceRole": "", + "isMultiStepDesign": false, + "instanceId": "f8791436-8d55-4fde-b4d5-72dd2cf13cfb", + "action": "None" +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicNetworkModel.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicNetworkModel.json new file mode 100644 index 000000000..cd411fed4 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicNetworkModel.json @@ -0,0 +1,56 @@ +{ + "service": { + "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450", + "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "name": "action-data", + "version": "1.0", + "toscaModelURL": null, + "category": "", + "serviceType": "", + "serviceRole": "", + "description": "", + "serviceEcompNaming": "false", + "instantiationType": "A-La-Carte", + "inputs": { + "2017488_adiodvpe0_ASN": { + "type": "string", + "description": "AV/PE", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "AV_vPE" + } + } + }, + "vnfs": {}, + "networks": { + "ExtVL 0": { + "uuid": "ddc3f20c-08b5-40fd-af72-c6d14636b986", + "invariantUuid": "379f816b-a7aa-422f-be30-17114ff50b7c", + "description": "ECOMP generic virtual link (network) base type for all other service-level and global networks", + "name": "ExtVL", + "version": "37.0", + "customizationUuid": "94fdd893-4a36-4d70-b16a-ec29c54c184f", + "inputs": {}, + "commands": {}, + "properties": { + "min_instances": 1, + "max_instances": 10, + "network_assignments": "{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}", + "exVL_naming": "{ecomp_generated_naming=true}", + "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}", + "network_homing": "{ecomp_selected_instance_node_target=false}" + }, + "type": "VL", + "modelCustomizationName": "ExtVL 0" + } + }, + "collectionResource": {}, + "configurations": {}, + "fabricConfigurations": {}, + "serviceProxies": {}, + "vfModules": {}, + "volumeGroups": {}, + "pnfs": {} +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicRedux.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicRedux.json index 714b3a429..858d0938e 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicRedux.json +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/basicRedux.json @@ -46,16 +46,16 @@ "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9", "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF", "int_ctl_net_name": "VMX-INTXI", - "vmx_int_ctl_prefix": "128.0.0.0", + "vmx_int_ctl_prefix": "10.0.0.10", "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5", "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279", "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a", "nf_type": "vPE", - "vmxvpfe_int_ctl_ip_1": "128.0.0.16", + "vmxvpfe_int_ctl_ip_1": "10.0.0.10", "is_AVPN_service": "false", "vmx_RSG_name": "vREXI-affinity", "vmx_int_ctl_forwarding": "l2", - "vmxvre_oam_ip_0": "10.40.123.5", + "vmxvre_oam_ip_0": "10.0.0.10", "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF", "vmxvpfe_sriov41_0_port_vlanstrip": "false", "vmxvpfe_sriov42_0_port_vlanfilter": "4001", @@ -84,7 +84,7 @@ "vf_module_id": "123", "nf_function": "JAI", "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true", - "vmxvre_int_ctl_ip_0": "128.0.0.1", + "vmxvre_int_ctl_ip_0": "10.0.0.10", "ecomp_generated_naming": "true", "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI", "vnf_name": "mtnj309me6vre", @@ -106,7 +106,7 @@ "vmxvre_volume_size_0": "45.0", "vmxvre_volume_size_1": "50.0", "vmxvpfe_sriov42_0_port_broadcastallow": "true", - "vmxvre_oam_gateway": "10.40.123.1", + "vmxvre_oam_gateway": "10.0.0.10", "vmxvre_volume_name_1": "vREXI_FAVolume", "vmxvre_ore_present": "0", "vmxvre_volume_name_0": "vREXI_FBVolume", @@ -146,16 +146,16 @@ "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9", "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF", "int_ctl_net_name": "VMX-INTXI", - "vmx_int_ctl_prefix": "128.0.0.0", + "vmx_int_ctl_prefix": "10.0.0.10", "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5", "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279", "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a", "nf_type": "vPE", - "vmxvpfe_int_ctl_ip_1": "128.0.0.16", + "vmxvpfe_int_ctl_ip_1": "10.0.0.10", "is_AVPN_service": "false", "vmx_RSG_name": "vREXI-affinity", "vmx_int_ctl_forwarding": "l2", - "vmxvre_oam_ip_0": "10.40.123.5", + "vmxvre_oam_ip_0": "10.0.0.10", "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF", "vmxvpfe_sriov41_0_port_vlanstrip": "false", "vmxvpfe_sriov42_0_port_vlanfilter": "4001", @@ -184,7 +184,7 @@ "vf_module_id": "123", "nf_function": "JAI", "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true", - "vmxvre_int_ctl_ip_0": "128.0.0.1", + "vmxvre_int_ctl_ip_0": "10.0.0.10", "ecomp_generated_naming": "true", "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI", "vnf_name": "mtnj309me6vre", @@ -206,7 +206,7 @@ "vmxvre_volume_size_0": "45.0", "vmxvre_volume_size_1": "50.0", "vmxvpfe_sriov42_0_port_broadcastallow": "true", - "vmxvre_oam_gateway": "10.40.123.1", + "vmxvre_oam_gateway": "10.0.0.10", "vmxvre_volume_name_1": "vREXI_FAVolume", "vmxvre_ore_present": "0", "vmxvre_volume_name_0": "vREXI_FBVolume", @@ -246,16 +246,16 @@ "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9", "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF", "int_ctl_net_name": "VMX-INTXI", - "vmx_int_ctl_prefix": "128.0.0.0", + "vmx_int_ctl_prefix": "10.0.0.10", "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5", "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279", "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a", "nf_type": "vPE", - "vmxvpfe_int_ctl_ip_1": "128.0.0.16", + "vmxvpfe_int_ctl_ip_1": "10.0.0.10", "is_AVPN_service": "false", "vmx_RSG_name": "vREXI-affinity", "vmx_int_ctl_forwarding": "l2", - "vmxvre_oam_ip_0": "10.40.123.5", + "vmxvre_oam_ip_0": "10.0.0.10", "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF", "vmxvpfe_sriov41_0_port_vlanstrip": "false", "vmxvpfe_sriov42_0_port_vlanfilter": "4001", @@ -284,7 +284,7 @@ "vf_module_id": "123", "nf_function": "JAI", "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true", - "vmxvre_int_ctl_ip_0": "128.0.0.1", + "vmxvre_int_ctl_ip_0": "10.0.0.10", "ecomp_generated_naming": "true", "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI", "vnf_name": "mtnj309me6vre", @@ -306,7 +306,7 @@ "vmxvre_volume_size_0": "45.0", "vmxvre_volume_size_1": "50.0", "vmxvpfe_sriov42_0_port_broadcastallow": "true", - "vmxvre_oam_gateway": "10.40.123.1", + "vmxvre_oam_gateway": "10.0.0.10", "vmxvre_volume_name_1": "vREXI_FAVolume", "vmxvre_ore_present": "0", "vmxvre_volume_name_0": "vREXI_FBVolume", @@ -778,28 +778,28 @@ "lcpRegionsAndTenants": { "lcpRegionList": [ { - "id": "AAIAIC25", - "name": "AAIAIC25", + "id": "JANET25", + "name": "JANET25 (AIC)", "isPermitted": true }, { - "id": "mtn6", - "name": "mtn6", + "id": "hvf6", + "name": "hvf6 (AIC)", "isPermitted": true } ], "lcpRegionsTenantsMap": { - "AAIAIC25": [ + "JANET25": [ { "id": "092eb9e8e4b7412e8787dd091bc58e86", "name": "USP-SIP-IC-24335-T-01", "isPermitted": true } ], - "mtn6": [ + "hvf6": [ { "id": "bae71557c5bb4d5aac6743a4e5f1d054", - "name": "AIN Web Tool-15-D-testgamma", + "name": "AIN Web Tool-15-D-testalexandria", "isPermitted": true }, { @@ -939,7 +939,7 @@ }, { "id": "d0a3e3f2964542259d155a81c41aadc3", - "name": "test-mtn6-09", + "name": "test-hvf6-09", "isPermitted": true }, { @@ -953,34 +953,34 @@ "subscribers": [ { "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "name": "Mobility", + "name": "Emanuel", "isPermitted": false }, { "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fc", - "name": "PACKET CORE", + "name": "JULIO ERICKSON", "isPermitted": false }, { "id": "e433710f-9217-458d-a79d-1c7aff376d89", - "name": "USP VOICE", + "name": "SILVIA ROBBINS", "isPermitted": true } ], "productFamilies": [ { "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034", - "name": "DHV", + "name": "SCOTTIE", "isPermitted": true }, { "id": "17cc1042-527b-11e6-beb8-9e71128cae77", - "name": "FLEXREACH", + "name": "IGNACIO", "isPermitted": true }, { "id": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e", - "name": "Netbond", + "name": "Christie", "isPermitted": true }, { @@ -989,8 +989,8 @@ "isPermitted": true }, { - "id": "vRRaaS", - "name": "vRRaaS", + "id": "vTerrance", + "name": "vTerrance", "isPermitted": true }, { @@ -1000,7 +1000,7 @@ }, { "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "name": "Mobility", + "name": "Emanuel", "isPermitted": true }, { @@ -1010,7 +1010,7 @@ }, { "id": "db171b8f-115c-4992-a2e3-ee04cae357e0", - "name": "FIRSTNET", + "name": "LINDSEY", "isPermitted": true }, { @@ -1019,18 +1019,18 @@ "isPermitted": true }, { - "id": "vHNGWaas", + "id": "vRosemarie", "name": "HNGATEWAY", "isPermitted": true }, { "id": "vHNPaas", - "name": "HNPORTAL", + "name": "WILKINS", "isPermitted": true }, { "id": "e433710f-9217-458d-a79d-1c7aff376d89", - "name": "VIRTUAL USP", + "name": "TYLER SILVIA", "isPermitted": true }, { @@ -1039,18 +1039,18 @@ "isPermitted": true }, { - "id": "VIPRaaS", - "name": "vIPRaaS", + "id": "Cisneros", + "name": "vMuriel", "isPermitted": true }, { "id": "0ee8c1bc-7cbd-4b0a-a1ac-e9999255abc1", - "name": "WAN Bonding", + "name": "CARA Griffin", "isPermitted": true }, { "id": "c7611ebe-c324-48f1-8085-94aef0c6ef3d", - "name": "HOSTED COMMUNICATIONS", + "name": "DARREN MCGEE", "isPermitted": true }, { @@ -1059,23 +1059,23 @@ "isPermitted": true }, { - "id": "vVIGaaS", - "name": "vVIGaaS", + "id": "vSalvatore", + "name": "vSalvatore", "isPermitted": true }, { "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4", - "name": "uCPE-VMS", + "name": "Josefina", "isPermitted": true }, { - "id": "vPEaaS", - "name": "vPEaaS", + "id": "vHubbard", + "name": "vHubbard", "isPermitted": true }, { "id": "12a96a9d-4b4c-4349-a950-fe1159602621", - "name": "HOSTED COMMUNICATIONS", + "name": "DARREN MCGEE", "isPermitted": true } ], @@ -1083,22 +1083,22 @@ "e433710f-9217-458d-a79d-1c7aff376d89": [ { "id": "0", - "name": "vFlowLogic", + "name": "vRichardson", "isPermitted": false }, { "id": "1", - "name": "VIRTUAL USP", + "name": "TYLER SILVIA", "isPermitted": true }, { "id": "2", - "name": "Mobility", + "name": "Emanuel", "isPermitted": false }, { "id": "3", - "name": "vBNG", + "name": "vJamie", "isPermitted": false }, { @@ -1108,7 +1108,7 @@ }, { "id": "5", - "name": "Nimbus", + "name": "Kennedy", "isPermitted": false }, { @@ -1163,17 +1163,17 @@ }, { "id": "16", - "name": "FIRSTNET", + "name": "LINDSEY", "isPermitted": false }, { "id": "17", - "name": "ACTIVE_CHARGE", + "name": "JOHANNA_SANTOS", "isPermitted": false }, { "id": "18", - "name": "vHSS", + "name": "vCarroll", "isPermitted": false } ] @@ -1956,17 +1956,17 @@ }, { "id": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", - "name": "MetroPacketCore" + "name": "WayneHolland" }, { - "id": "Wireline", - "name": "Wireline" + "id": "Melissa", + "name": "Melissa" } ], "projectList": [ { - "id": "DFW", - "name": "DFW" + "id": "WATKINS", + "name": "WATKINS" }, { "id": "x1", @@ -1979,8 +1979,8 @@ ], "lineOfBusinessList": [ { - "id": "ECOMP", - "name": "ECOMP" + "id": "ONAP", + "name": "ONAP" }, { "id": "zzz1", diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro1.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro1.json new file mode 100644 index 000000000..4a0dc2422 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro1.json @@ -0,0 +1,192 @@ +{ + "service": { + "uuid": "74fa72dd-012b-49c3-800d-06b12bcaf1a0", + "invariantUuid": "bceeaff9-5716-42bf-8fa1-8c6f720cf61d", + "name": "Dror_service1806_Macro1", + "version": "2.0", + "toscaModelURL": null, + "category": "Emanuel", + "serviceType": "b", + "serviceRole": "c", + "description": "test", + "serviceEcompNaming": "false", + "instantiationType": "Macro", + "inputs": {} + }, + "vnfs": { + "092017_VSP_GINGERby11 0": { + "uuid": "1ecfa5f1-78c5-41f6-ad34-753ca1fcdc5d", + "invariantUuid": "e88d6582-b7e5-4dc6-ac9c-6f7130727a92", + "description": "092017_VSP_GINGERby11", + "name": "092017_VSP_GINGERby11", + "version": "1.0", + "customizationUuid": "cc40295f-a834-4f42-b634-32fff9d6489b", + "inputs": {}, + "commands": {}, + "properties": { + "nf_naming": "{ecomp_generated_naming=true}", + "mmn_volume_name_4": "misc-mn-v-vde", + "multi_stage_design": "false", + "mmn_volume_size_1": "20.0", + "mmn_volume_name_1": "data-mn-v-vdb", + "availability_zone_max_count": "1", + "mmn_volume_name_3": "backup-mn-v-vdd", + "mmn_volume_name_2": "arch-mn-v-vdc", + "ecomp_generated_naming": "true", + "mmn_volume_size_2": "20.0", + "mmn_volume_size_3": "50.0", + "mmn_volume_size_4": "20.0" + }, + "type": "VF", + "modelCustomizationName": "092017_VSP_GINGERby11 0", + "vfModules": { + "092017_vsp_gingerby110..092017VspGingerby11..pxmc_vmt..module-1": { + "uuid": "96af1531-35b5-44b8-b8e9-17e400cce6fd", + "invariantUuid": "be556344-d212-4c88-9fe1-c72003591e78", + "customizationUuid": "abb15cf7-174a-4815-86e8-91997b1f07b7", + "description": null, + "name": "092017VspGingerby11..pxmc_vmt..module-1", + "version": "1", + "modelCustomizationName": "092017VspGingerby11..pxmc_vmt..module-1", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "pxmc_vmt" + }, + "inputs": {}, + "volumeGroupAllowed": false + }, + "092017_vsp_gingerby110..092017VspGingerby11..pxmc_mmn..module-2": { + "uuid": "2d8bf918-ad4b-42f6-b87d-8cb5c13660b6", + "invariantUuid": "19c5c400-9d33-4e69-a0ef-9a26ebe68b3d", + "customizationUuid": "6268df2d-74cc-4189-b7b5-7f833b54d457", + "description": null, + "name": "092017VspGingerby11..pxmc_mmn..module-2", + "version": "1", + "modelCustomizationName": "092017VspGingerby11..pxmc_mmn..module-2", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "pxmc_mmn" + }, + "inputs": {}, + "volumeGroupAllowed": true + }, + "092017_vsp_gingerby110..092017VspGingerby11..pxmc_base..module-0": { + "uuid": "a3d8289d-7b29-4e0f-8b51-e825bfe54749", + "invariantUuid": "dea04dc1-f4fb-435d-80b4-f176d4c15653", + "customizationUuid": "e6e4a00e-3fde-459c-9a68-4bf2b35d5e9e", + "description": null, + "name": "092017VspGingerby11..pxmc_base..module-0", + "version": "1", + "modelCustomizationName": "092017VspGingerby11..pxmc_base..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "pxmc_base" + }, + "inputs": {}, + "volumeGroupAllowed": false + } + }, + "volumeGroups": { + "092017_vsp_gingerby110..092017VspGingerby11..pxmc_mmn..module-2": { + "uuid": "2d8bf918-ad4b-42f6-b87d-8cb5c13660b6", + "invariantUuid": "19c5c400-9d33-4e69-a0ef-9a26ebe68b3d", + "customizationUuid": "6268df2d-74cc-4189-b7b5-7f833b54d457", + "description": null, + "name": "092017VspGingerby11..pxmc_mmn..module-2", + "version": "1", + "modelCustomizationName": "092017VspGingerby11..pxmc_mmn..module-2", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "pxmc_mmn" + }, + "inputs": {} + } + }, + "vfcInstanceGroups": {} + } + }, + "networks": {}, + "collectionResource": {}, + "configurations": {}, + "serviceProxies": {}, + "vfModules": { + "092017_vsp_gingerby110..092017VspGingerby11..pxmc_vmt..module-1": { + "uuid": "96af1531-35b5-44b8-b8e9-17e400cce6fd", + "invariantUuid": "be556344-d212-4c88-9fe1-c72003591e78", + "customizationUuid": "abb15cf7-174a-4815-86e8-91997b1f07b7", + "description": null, + "name": "092017VspGingerby11..pxmc_vmt..module-1", + "version": "1", + "modelCustomizationName": "092017VspGingerby11..pxmc_vmt..module-1", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "pxmc_vmt" + }, + "inputs": {}, + "volumeGroupAllowed": false + }, + "092017_vsp_gingerby110..092017VspGingerby11..pxmc_base..module-0": { + "uuid": "a3d8289d-7b29-4e0f-8b51-e825bfe54749", + "invariantUuid": "dea04dc1-f4fb-435d-80b4-f176d4c15653", + "customizationUuid": "e6e4a00e-3fde-459c-9a68-4bf2b35d5e9e", + "description": null, + "name": "092017VspGingerby11..pxmc_base..module-0", + "version": "1", + "modelCustomizationName": "092017VspGingerby11..pxmc_base..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "pxmc_base" + }, + "inputs": {}, + "volumeGroupAllowed": false + }, + "092017_vsp_gingerby110..092017VspGingerby11..pxmc_mmn..module-2": { + "uuid": "2d8bf918-ad4b-42f6-b87d-8cb5c13660b6", + "invariantUuid": "19c5c400-9d33-4e69-a0ef-9a26ebe68b3d", + "customizationUuid": "6268df2d-74cc-4189-b7b5-7f833b54d457", + "description": null, + "name": "092017VspGingerby11..pxmc_mmn..module-2", + "version": "1", + "modelCustomizationName": "092017VspGingerby11..pxmc_mmn..module-2", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "pxmc_mmn" + }, + "inputs": {}, + "volumeGroupAllowed": true + } + }, + "volumeGroups": { + "092017_vsp_gingerby110..092017VspGingerby11..pxmc_mmn..module-2": { + "uuid": "2d8bf918-ad4b-42f6-b87d-8cb5c13660b6", + "invariantUuid": "19c5c400-9d33-4e69-a0ef-9a26ebe68b3d", + "customizationUuid": "6268df2d-74cc-4189-b7b5-7f833b54d457", + "description": null, + "name": "092017VspGingerby11..pxmc_mmn..module-2", + "version": "1", + "modelCustomizationName": "092017VspGingerby11..pxmc_mmn..module-2", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "pxmc_mmn" + }, + "inputs": {} + } + }, + "pnfs": {} +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro_NW.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro_NW.json new file mode 100644 index 000000000..fe7efe36f --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/Dror_service1806_Macro_NW.json @@ -0,0 +1,143 @@ +{ + "service": { + "uuid": "bd8ffd14-da36-4f62-813c-6716ba9f4354", + "invariantUuid": "b1f489c0-2aa0-47e1-ba6c-98658d6945bf", + "name": "Dror_service1806_Macro_NW", + "version": "1.0", + "toscaModelURL": null, + "category": "Emanuel", + "serviceType": "cc", + "serviceRole": "ccc", + "description": "test", + "serviceEcompNaming": "true", + "instantiationType": "Macro", + "inputs": {} + }, + "vnfs": { + "2016-233_XSP_bfsa_nin2 0": { + "uuid": "327138f7-0608-4774-bb2c-959332a18399", + "invariantUuid": "74dc0354-a178-43ee-91f2-ec1f288cd50d", + "description": "VSP for XSP after network recreated", + "name": "2016-233_XSP_bfsa_nin2", + "version": "1.0", + "customizationUuid": "643b38b5-b75b-4506-8be5-55595ca2cbef", + "inputs": {}, + "commands": {}, + "properties": { + "xsa_PF_DMZ_security_group": "default", + "nf_naming": "{ecomp_generated_naming=true}", + "multi_stage_design": "false", + "availability_zone_max_count": "1", + "xsa_IF_DMZ_security_group": "default", + "xsa_image_name": "E-IPFR_XSP_R21.qcow2", + "ecomp_generated_naming": "true", + "vnf_name": "bfsa0007v", + "xsa_cinder_volume_size_0": "300", + "xsa_flavor_name": "nd.c4r8d0", + "xsa_cinder_volume_size_1": "300", + "xsa_NSDNet_net_security_group": "default" + }, + "type": "VF", + "modelCustomizationName": "2016-233_XSP_bfsa_nin2 0", + "vfModules": { + "2016233_xsp_bfsa_nin20..2016233XspBfsaNin2..base_bwks_xspa..module-0": { + "uuid": "52d5a1a1-ada5-49b6-864c-8405af43b6b4", + "invariantUuid": "dfb65a6b-d5ba-4142-bbee-b83eda3902d6", + "customizationUuid": "d9d146cc-48c1-43fb-a6ef-927c75eaa4ab", + "description": null, + "name": "2016233XspBfsaNin2..base_bwks_xspa..module-0", + "version": "1", + "modelCustomizationName": "2016233XspBfsaNin2..base_bwks_xspa..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "base_bwks_xspa" + }, + "inputs": {}, + "volumeGroupAllowed": true + } + }, + "volumeGroups": { + "2016233_xsp_bfsa_nin20..2016233XspBfsaNin2..base_bwks_xspa..module-0": { + "uuid": "52d5a1a1-ada5-49b6-864c-8405af43b6b4", + "invariantUuid": "dfb65a6b-d5ba-4142-bbee-b83eda3902d6", + "customizationUuid": "d9d146cc-48c1-43fb-a6ef-927c75eaa4ab", + "description": null, + "name": "2016233XspBfsaNin2..base_bwks_xspa..module-0", + "version": "1", + "modelCustomizationName": "2016233XspBfsaNin2..base_bwks_xspa..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "base_bwks_xspa" + }, + "inputs": {} + } + }, + "vfcInstanceGroups": {} + } + }, + "networks": { + "ExtVL 0": { + "uuid": "40083c20-b1ab-449a-8f6d-f75406c497ac", + "invariantUuid": "379f816b-a7aa-422f-be30-17114ff50b7c", + "description": "ECOMP generic virtual link (network) base type for all other service-level and global networks", + "name": "ExtVL", + "version": "40.0", + "customizationUuid": "14ef5a8f-55db-411b-a64c-40c200073f1f", + "inputs": {}, + "commands": {}, + "properties": { + "network_assignments": "{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}", + "exVL_naming": "{ecomp_generated_naming=true}", + "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}", + "network_homing": "{ecomp_selected_instance_node_target=false}" + }, + "type": "VL", + "modelCustomizationName": "ExtVL 0" + } + }, + "collectionResource": {}, + "configurations": {}, + "serviceProxies": {}, + "vfModules": { + "2016233_xsp_bfsa_nin20..2016233XspBfsaNin2..base_bwks_xspa..module-0": { + "uuid": "52d5a1a1-ada5-49b6-864c-8405af43b6b4", + "invariantUuid": "dfb65a6b-d5ba-4142-bbee-b83eda3902d6", + "customizationUuid": "d9d146cc-48c1-43fb-a6ef-927c75eaa4ab", + "description": null, + "name": "2016233XspBfsaNin2..base_bwks_xspa..module-0", + "version": "1", + "modelCustomizationName": "2016233XspBfsaNin2..base_bwks_xspa..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "base_bwks_xspa" + }, + "inputs": {}, + "volumeGroupAllowed": true + } + }, + "volumeGroups": { + "2016233_xsp_bfsa_nin20..2016233XspBfsaNin2..base_bwks_xspa..module-0": { + "uuid": "52d5a1a1-ada5-49b6-864c-8405af43b6b4", + "invariantUuid": "dfb65a6b-d5ba-4142-bbee-b83eda3902d6", + "customizationUuid": "d9d146cc-48c1-43fb-a6ef-927c75eaa4ab", + "description": null, + "name": "2016233XspBfsaNin2..base_bwks_xspa..module-0", + "version": "1", + "modelCustomizationName": "2016233XspBfsaNin2..base_bwks_xspa..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "base_bwks_xspa" + }, + "inputs": {} + } + }, + "pnfs": {} +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/list-services.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/list-services.json new file mode 100644 index 000000000..daa413dd9 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/list-services.json @@ -0,0 +1,47 @@ +{ + "services": [ + { + "uuid": "ee6d61be-4841-4f98-8f23-5de9da846ca7", + "invariantUUID": "b7d923c9-6175-41f1-91ba-4565c4953408", + "name": "ServiceContainerMultiplepProbes", + "version": "1.0", + "toscaModelURL": null, + "category": "service", + "lifecycleState": null, + "lastUpdaterUserId": null, + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTION_COMPLETE_OK", + "artifacts": null, + "resources": null + }, + { + "uuid": "bd8ffd14-da36-4f62-813c-6716ba9f4354", + "invariantUUID": "b1f489c0-2aa0-47e1-ba6c-98658d6945bf", + "name": "Dror_service1806_Macro_NW", + "version": "1.0", + "toscaModelURL": null, + "category": "service", + "lifecycleState": null, + "lastUpdaterUserId": null, + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTION_COMPLETE_OK", + "artifacts": null, + "resources": null + }, + { + "uuid": "74fa72dd-012b-49c3-800d-06b12bcaf1a0", + "invariantUUID": "bceeaff9-5716-42bf-8fa1-8c6f720cf61d", + "name": "Dror_service1806_Macro1", + "version": "2.0", + "toscaModelURL": null, + "category": "service", + "lifecycleState": null, + "lastUpdaterUserId": null, + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTION_COMPLETE_OK", + "artifacts": null, + "resources": null + } + ], + "readOnly": false +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/service-with-configuration.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/service-with-configuration.json new file mode 100644 index 000000000..12d1c273a --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug616888/service-with-configuration.json @@ -0,0 +1,170 @@ +{ + "service": { + "uuid": "ee6d61be-4841-4f98-8f23-5de9da846ca7", + "invariantUuid": "b7d923c9-6175-41f1-91ba-4565c4953408", + "name": "ServiceContainerMultiplepProbes", + "version": "1.0", + "toscaModelURL": null, + "category": "Network L1-3", + "serviceType": "portMirroring", + "serviceRole": "pProbe", + "description": "sdfsdfsdf", + "serviceEcompNaming": "true", + "instantiationType": "ClientConfig", + "inputs": {} + }, + "vnfs": {}, + "networks": {}, + "collectionResource": {}, + "configurations": { + "Port Mirroring Configuration By Policy 1": { + "uuid": "f58d039d-4cfc-40ec-bd75-1f05f0458a6c", + "invariantUuid": "c30a024e-a6c6-4670-b73c-3df64eb57ff6", + "description": "A port mirroring configuration by policy object", + "name": "Port Mirroring Configuration By Policy", + "version": "1.0", + "customizationUuid": "4b7ebace-bad6-4526-9be6-bf248e20fc5f", + "inputs": {}, + "commands": {}, + "properties": { + "collector_node": "pprobeservice_proxy 5", + "policy_name": "policy2", + "equip_vendor": "Cisco", + "equip_model": "Nexus 3048-TP" + }, + "type": "Configuration", + "modelCustomizationName": "Port Mirroring Configuration By Policy 1", + "sourceNodes": [ + "vmmeservice2_proxy 2", + "vmmeservice2_proxy 3", + "vmmeservice_proxy 1" + ], + "collectorNodes": [ + "pprobeservice_proxy 5" + ], + "configurationByPolicy": true + }, + "Port Mirroring Configuration By Policy 0": { + "uuid": "f58d039d-4cfc-40ec-bd75-1f05f0458a6c", + "invariantUuid": "c30a024e-a6c6-4670-b73c-3df64eb57ff6", + "description": "A port mirroring configuration by policy object", + "name": "Port Mirroring Configuration By Policy", + "version": "1.0", + "customizationUuid": "08a181aa-72eb-435f-9593-e88a3ad0a86b", + "inputs": {}, + "commands": {}, + "properties": { + "collector_node": "pprobeservice_proxy 4", + "policy_name": "policy1", + "equip_vendor": "Cisco", + "equip_model": "Nexus 3048-TP" + }, + "type": "Configuration", + "modelCustomizationName": "Port Mirroring Configuration By Policy 0", + "sourceNodes": [ + "vmmeservice2_proxy 2", + "vmmeservice_proxy 1", + "vmmeservice_proxy 0" + ], + "collectorNodes": [ + "pprobeservice_proxy 4" + ], + "configurationByPolicy": true + } + }, + "serviceProxies": { + "vmmeservice_proxy 0": { + "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee", + "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10", + "description": "A Proxy for Service vmmeService", + "name": "vmmeService Service Proxy", + "version": "1.0", + "customizationUuid": "d7cfe338-eeda-4217-ba13-f24b0811fb17", + "inputs": {}, + "commands": {}, + "properties": {}, + "type": "Service Proxy", + "sourceModelUuid": "c3e6c9bd-b24d-458e-aa99-e0cadf70c5e5", + "sourceModelInvariant": "dd8a805d-3946-4f11-9831-e26cd6aec9a3", + "sourceModelName": "vmmeService" + }, + "vmmeservice_proxy 1": { + "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee", + "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10", + "description": "A Proxy for Service vmmeService", + "name": "vmmeService Service Proxy", + "version": "1.0", + "customizationUuid": "7a69f133-564c-4eb6-b93e-0a8281967efb", + "inputs": {}, + "commands": {}, + "properties": {}, + "type": "Service Proxy", + "sourceModelUuid": "c3e6c9bd-b24d-458e-aa99-e0cadf70c5e5", + "sourceModelInvariant": "dd8a805d-3946-4f11-9831-e26cd6aec9a3", + "sourceModelName": "vmmeService" + }, + "vmmeservice2_proxy 3": { + "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee", + "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10", + "description": "A Proxy for Service vmmeService2", + "name": "vmmeService2 Service Proxy", + "version": "1.0", + "customizationUuid": "9d81c21f-e29c-44f6-b5f6-caa974ee078a", + "inputs": {}, + "commands": {}, + "properties": {}, + "type": "Service Proxy", + "sourceModelUuid": "2a2ea15f-07c6-4b89-bfca-e8aba39a34d6", + "sourceModelInvariant": "a7eac2b3-8444-40ee-92e3-b3359b32445c", + "sourceModelName": "vmmeService2" + }, + "pprobeservice_proxy 4": { + "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee", + "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10", + "description": "A Proxy for Service pProbeService", + "name": "pProbeService Service Proxy", + "version": "1.0", + "customizationUuid": "271efa3b-276e-4536-976a-cc9c9c014f1e", + "inputs": {}, + "commands": {}, + "properties": {}, + "type": "Service Proxy", + "sourceModelUuid": "8a84e59b-45fe-4851-8ff1-34225a0b32c3", + "sourceModelInvariant": "83b458fd-5dd3-419b-a9e3-7335814a0911", + "sourceModelName": "pProbeService" + }, + "pprobeservice_proxy 5": { + "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee", + "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10", + "description": "A Proxy for Service pProbeService", + "name": "pProbeService Service Proxy", + "version": "1.0", + "customizationUuid": "d64623ae-5935-4afd-803e-c86e94d8e740", + "inputs": {}, + "commands": {}, + "properties": {}, + "type": "Service Proxy", + "sourceModelUuid": "8a84e59b-45fe-4851-8ff1-34225a0b32c3", + "sourceModelInvariant": "83b458fd-5dd3-419b-a9e3-7335814a0911", + "sourceModelName": "pProbeService" + }, + "vmmeservice2_proxy 2": { + "uuid": "a32fee17-5b59-4c34-ba6f-6dd2f1c61fee", + "invariantUuid": "2933b574-d28d-45ea-bf22-4df2907e4a10", + "description": "A Proxy for Service vmmeService2", + "name": "vmmeService2 Service Proxy", + "version": "1.0", + "customizationUuid": "060be63d-5f9c-4fd0-8ef7-830d5e8eca17", + "inputs": {}, + "commands": {}, + "properties": {}, + "type": "Service Proxy", + "sourceModelUuid": "2a2ea15f-07c6-4b89-bfca-e8aba39a34d6", + "sourceModelInvariant": "a7eac2b3-8444-40ee-92e3-b3359b32445c", + "sourceModelName": "vmmeService2" + } + }, + "vfModules": {}, + "volumeGroups": {}, + "pnfs": {} +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/list-services.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/list-services.json new file mode 100644 index 000000000..c93191db1 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/list-services.json @@ -0,0 +1,19 @@ +{ + "services": [ + { + "uuid": "09c476c7-91ae-44b8-a731-04d8d8fa3695", + "invariantUUID": "11819cb5-0ad7-4c6d-9205-2ac30d09bdc6", + "name": "Mobility Networking Svc Mode", + "version": "1.0", + "toscaModelURL": null, + "category": "service", + "lifecycleState": null, + "lastUpdaterUserId": null, + "lastUpdaterFullName": null, + "distributionStatus": "DISTRIBUTION_COMPLETE_OK", + "artifacts": null, + "resources": null + } + ], + "readOnly": false +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/serviceWithoutInstantiationType.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/serviceWithoutInstantiationType.json new file mode 100644 index 000000000..90ca6128b --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/bug_aLaCarteServiceWrongPopup/serviceWithoutInstantiationType.json @@ -0,0 +1,25 @@ +{ + "service": { + "uuid": "09c476c7-91ae-44b8-a731-04d8d8fa3695", + "invariantUuid": "11819cb5-0ad7-4c6d-9205-2ac30d09bdc6", + "name": "Mobility Networking Svc Mode", + "version": "1.0", + "toscaModelURL": null, + "category": "Emanuel", + "serviceType": null, + "serviceRole": null, + "description": "single generic service model with mobility VLs in it to create any mobility network", + "serviceEcompNaming": "false", + "instantiationType": null, + "inputs": {} + }, + "vnfs": {}, + "networks": {}, + "collectionResource": null, + "configurations": null, + "fabricConfigurations": {}, + "serviceProxies": null, + "vfModules": null, + "volumeGroups": null, + "pnfs": null +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/categoryParametres.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/categoryParametres.json index 93a8bf5d6..e95d1d43b 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/categoryParametres.json +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/categoryParametres.json @@ -2,8 +2,8 @@ "categoryParameters": { "lineOfBusiness": [ { - "id": "ECOMP", - "name": "ECOMP" + "id": "ONAP", + "name": "ONAP" }, { "id": "zzz1", @@ -17,17 +17,17 @@ }, { "id": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", - "name": "MetroPacketCore" + "name": "WayneHolland" }, { - "id": "Wireline", - "name": "Wireline" + "id": "Melissa", + "name": "Melissa" } ], "project": [ { - "id": "DFW", - "name": "DFW" + "id": "WATKINS", + "name": "WATKINS" }, { "id": "x1", diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/createdFabricConfigService.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/createdFabricConfigService.json new file mode 100644 index 000000000..3e556550c --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/createdFabricConfigService.json @@ -0,0 +1,51 @@ +{ + "service": { + "uuid": "90004bb4-a416-4b4e-997e-0059973630b9", + "invariantUuid": "90003f9e-3244-4d8f-a8e0-0e5d7a29eda9", + "name": "ADIOD vMX vPE_BV Service 488", + "version": "1.0", + "toscaModelURL": null, + "category": "Network L1-3", + "serviceType": "", + "serviceRole": "", + "description": "ADIOD vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM", + "serviceEcompNaming": "true", + "instantiationType": "ClientConfig", + "inputs": { + + } + }, + "vnfs": { + + }, + "networks": { + + }, + "collectionResource": {}, + "configurations": { + + }, + "fabricConfigurations": { + "Fabric Configuration 0": { + "invariantUuid" : "1608eef4-de53-4334-a8d2-ba79cab4bddd", + "uuid": "88379cfd-fa0f-4946-8958-acc32640ceee", + "customizationUuid": "1e7f6512-c1cf-4b96-b5f5-b22a212ddad0", + "version": "3.0", + "name": "Fabric Configuration Object", + "description": "Fabric Configuration Object", + "type": "Configuration" + } + }, + "serviceProxies": { + + }, + "vfModules": { + + }, + "volumeGroups": { + + }, + "pnfs": { + + } +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/deactivatedFabricConfigService.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/deactivatedFabricConfigService.json new file mode 100644 index 000000000..e3aeca412 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/deactivatedFabricConfigService.json @@ -0,0 +1,51 @@ +{ + "service": { + "uuid": "10004bb4-a416-4b4e-997e-0059973630b9", + "invariantUuid": "10003f9e-3244-4d8f-a8e0-0e5d7a29eda9", + "name": "ADIOD vMX vPE_BV Service 488", + "version": "1.0", + "toscaModelURL": null, + "category": "Network L1-3", + "serviceType": "", + "serviceRole": "", + "description": "ADIOD vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM", + "serviceEcompNaming": "true", + "instantiationType": "ClientConfig", + "inputs": { + + } + }, + "vnfs": { + + }, + "networks": { + + }, + "collectionResource": {}, + "configurations": { + + }, + "fabricConfigurations": { + "Fabric Configuration 0": { + "invariantUuid" : "1608eef4-de53-4334-a8d2-ba79cab4bddd", + "uuid": "88379cfd-fa0f-4946-8958-acc32640ceee", + "customizationUuid": "1e7f6512-c1cf-4b96-b5f5-b22a212ddad0", + "version": "3.0", + "name": "Fabric Configuration Object", + "description": "Fabric Configuration Object", + "type": "Configuration" + } + }, + "serviceProxies": { + + }, + "vfModules": { + + }, + "volumeGroups": { + + }, + "pnfs": { + + } +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json index bf5420497..b1a139a80 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/emptyServiceRedux.json @@ -40,22 +40,24 @@ "inputs": {}, "commands": {}, "properties": { + "max_instances" : 10, + "min_instances" : 1, "vmxvre_retype": "RE-VMX", "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version", "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d", "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9", "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF", "int_ctl_net_name": "VMX-INTXI", - "vmx_int_ctl_prefix": "128.0.0.0", + "vmx_int_ctl_prefix": "10.0.0.10", "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5", "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279", "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a", "nf_type": "vPE", - "vmxvpfe_int_ctl_ip_1": "128.0.0.16", + "vmxvpfe_int_ctl_ip_1": "10.0.0.10", "is_AVPN_service": "false", "vmx_RSG_name": "vREXI-affinity", "vmx_int_ctl_forwarding": "l2", - "vmxvre_oam_ip_0": "10.40.123.5", + "vmxvre_oam_ip_0": "10.0.0.10", "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF", "vmxvpfe_sriov41_0_port_vlanstrip": "false", "vmxvpfe_sriov42_0_port_vlanfilter": "4001", @@ -84,8 +86,8 @@ "vf_module_id": "123", "nf_function": "JAI", "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true", - "vmxvre_int_ctl_ip_0": "128.0.0.1", - "ecomp_generated_naming": "true", + "vmxvre_int_ctl_ip_0": "10.0.0.10", + "ecomp_generated_naming": "false", "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI", "vnf_name": "mtnj309me6vre", "vmxvpfe_sriov41_0_port_unknownunicastallow": "true", @@ -106,7 +108,7 @@ "vmxvre_volume_size_0": "45.0", "vmxvre_volume_size_1": "50.0", "vmxvpfe_sriov42_0_port_broadcastallow": "true", - "vmxvre_oam_gateway": "10.40.123.1", + "vmxvre_oam_gateway": "10.0.0.10", "vmxvre_volume_name_1": "vREXI_FAVolume", "vmxvre_ore_present": "0", "vmxvre_volume_name_0": "vREXI_FBVolume", @@ -140,22 +142,24 @@ "inputs": {}, "commands": {}, "properties": { + "max_instances" : 10, + "min_instances" : 1, "vmxvre_retype": "RE-VMX", "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version", "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d", "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9", "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF", "int_ctl_net_name": "VMX-INTXI", - "vmx_int_ctl_prefix": "128.0.0.0", + "vmx_int_ctl_prefix": "10.0.0.10", "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5", "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279", "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a", "nf_type": "vPE", - "vmxvpfe_int_ctl_ip_1": "128.0.0.16", + "vmxvpfe_int_ctl_ip_1": "10.0.0.10", "is_AVPN_service": "false", "vmx_RSG_name": "vREXI-affinity", "vmx_int_ctl_forwarding": "l2", - "vmxvre_oam_ip_0": "10.40.123.5", + "vmxvre_oam_ip_0": "10.0.0.10", "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF", "vmxvpfe_sriov41_0_port_vlanstrip": "false", "vmxvpfe_sriov42_0_port_vlanfilter": "4001", @@ -184,7 +188,7 @@ "vf_module_id": "123", "nf_function": "JAI", "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true", - "vmxvre_int_ctl_ip_0": "128.0.0.1", + "vmxvre_int_ctl_ip_0": "10.0.0.10", "ecomp_generated_naming": "true", "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI", "vnf_name": "mtnj309me6vre", @@ -206,7 +210,7 @@ "vmxvre_volume_size_0": "45.0", "vmxvre_volume_size_1": "50.0", "vmxvpfe_sriov42_0_port_broadcastallow": "true", - "vmxvre_oam_gateway": "10.40.123.1", + "vmxvre_oam_gateway": "10.0.0.10", "vmxvre_volume_name_1": "vREXI_FAVolume", "vmxvre_ore_present": "0", "vmxvre_volume_name_0": "vREXI_FBVolume", @@ -240,22 +244,24 @@ "inputs": {}, "commands": {}, "properties": { + "max_instances" : 10, + "min_instances" : 1, "vmxvre_retype": "RE-VMX", "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version", "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d", "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9", "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF", "int_ctl_net_name": "VMX-INTXI", - "vmx_int_ctl_prefix": "128.0.0.0", + "vmx_int_ctl_prefix": "10.0.0.10", "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5", "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279", "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a", "nf_type": "vPE", - "vmxvpfe_int_ctl_ip_1": "128.0.0.16", + "vmxvpfe_int_ctl_ip_1": "10.0.0.10", "is_AVPN_service": "false", "vmx_RSG_name": "vREXI-affinity", "vmx_int_ctl_forwarding": "l2", - "vmxvre_oam_ip_0": "10.40.123.5", + "vmxvre_oam_ip_0": "10.0.0.10", "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF", "vmxvpfe_sriov41_0_port_vlanstrip": "false", "vmxvpfe_sriov42_0_port_vlanfilter": "4001", @@ -284,8 +290,8 @@ "vf_module_id": "123", "nf_function": "JAI", "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true", - "vmxvre_int_ctl_ip_0": "128.0.0.1", - "ecomp_generated_naming": "true", + "vmxvre_int_ctl_ip_0": "10.0.0.10", + "ecomp_generated_naming": "false", "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI", "vnf_name": "mtnj309me6vre", "vmxvpfe_sriov41_0_port_unknownunicastallow": "true", @@ -306,7 +312,7 @@ "vmxvre_volume_size_0": "45.0", "vmxvre_volume_size_1": "50.0", "vmxvpfe_sriov42_0_port_broadcastallow": "true", - "vmxvre_oam_gateway": "10.40.123.1", + "vmxvre_oam_gateway": "10.0.0.10", "vmxvre_volume_name_1": "vREXI_FAVolume", "vmxvre_ore_present": "0", "vmxvre_volume_name_0": "vREXI_FBVolume", @@ -815,16 +821,16 @@ "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9", "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF", "int_ctl_net_name": "VMX-INTXI", - "vmx_int_ctl_prefix": "128.0.0.0", + "vmx_int_ctl_prefix": "10.0.0.10", "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5", "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279", "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a", "nf_type": "ROUTER", - "vmxvpfe_int_ctl_ip_1": "128.0.0.16", + "vmxvpfe_int_ctl_ip_1": "10.0.0.10", "is_AVPN_service": "false", "vmx_RSG_name": "vREXI-affinity", "vmx_int_ctl_forwarding": "l2", - "vmxvre_oam_ip_0": "10.40.123.5", + "vmxvre_oam_ip_0": "10.0.0.10", "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF", "vmxvpfe_sriov41_0_port_vlanstrip": "false", "vmxvpfe_sriov42_0_port_vlanfilter": "4001", @@ -854,7 +860,7 @@ "vf_module_id": "123", "nf_function": "ADIOD vPE", "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true", - "vmxvre_int_ctl_ip_0": "128.0.0.1", + "vmxvre_int_ctl_ip_0": "10.0.0.10", "ecomp_generated_naming": "true", "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI", "vnf_name": "mtnj309me6vre", @@ -876,7 +882,7 @@ "vmxvre_volume_size_0": "45.0", "vmxvre_volume_size_1": "50.0", "vmxvpfe_sriov42_0_port_broadcastallow": "true", - "vmxvre_oam_gateway": "10.40.123.1", + "vmxvre_oam_gateway": "10.0.0.10", "vmxvre_volume_name_1": "vREXI_FAVolume", "vmxvre_ore_present": "0", "vmxvre_volume_name_0": "vREXI_FBVolume", @@ -1402,6 +1408,8 @@ }, "serviceInstance": { "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd": { + "existingVNFCounterMap": {}, + "existingNetworksCounterMap" : {}, "vnfs": {}, "instanceParams": [ { @@ -1410,11 +1418,11 @@ ], "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034", - "subscriptionServiceType": "VIRTUAL USP", - "lcpCloudRegionId": "AAIAIC25", + "subscriptionServiceType": "TYLER SILVIA", + "lcpCloudRegionId": "JANET25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "aicZoneId": "JAG1", - "projectName": "DFW", + "projectName": "WATKINS", "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", "bulkSize": 1, "modelInfo": { @@ -1424,36 +1432,37 @@ "modelName": "action-data", "modelVersion": "1.0" }, - "isUserProvidedNaming": false, + "isEcompGeneratedNaming": true, "tenantName": "USP-SIP-IC-24335-T-01", - "aicZoneName": "YUDFJULP-JAG1" + "aicZoneName": "YUDFJULP-JAG1", + "existingNames": {} } }, "lcpRegionsAndTenants": { "lcpRegionList": [ { - "id": "AAIAIC25", - "name": "AAIAIC25", + "id": "JANET25", + "name": "JANET25", "isPermitted": true }, { - "id": "mtn6", - "name": "mtn6", + "id": "hvf6", + "name": "hvf6", "isPermitted": true } ], "lcpRegionsTenantsMap": { - "AAIAIC25": [ + "JANET25": [ { "id": "092eb9e8e4b7412e8787dd091bc58e86", "name": "USP-SIP-IC-24335-T-01", "isPermitted": true } ], - "mtn6": [ + "hvf6": [ { "id": "bae71557c5bb4d5aac6743a4e5f1d054", - "name": "AIN Web Tool-15-D-testgamma", + "name": "AIN Web Tool-15-D-testalexandria", "isPermitted": true }, { @@ -1593,7 +1602,7 @@ }, { "id": "d0a3e3f2964542259d155a81c41aadc3", - "name": "test-mtn6-09", + "name": "test-hvf6-09", "isPermitted": true }, { @@ -1607,34 +1616,34 @@ "subscribers": [ { "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "name": "Mobility", + "name": "Emanuel", "isPermitted": false }, { "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fc", - "name": "PACKET CORE", + "name": "JULIO ERICKSON", "isPermitted": false }, { "id": "e433710f-9217-458d-a79d-1c7aff376d89", - "name": "USP VOICE", + "name": "SILVIA ROBBINS", "isPermitted": true } ], "productFamilies": [ { "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034", - "name": "DHV", + "name": "SCOTTIE", "isPermitted": true }, { "id": "17cc1042-527b-11e6-beb8-9e71128cae77", - "name": "FLEXREACH", + "name": "IGNACIO", "isPermitted": true }, { "id": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e", - "name": "Netbond", + "name": "Christie", "isPermitted": true }, { @@ -1643,8 +1652,8 @@ "isPermitted": true }, { - "id": "vRRaaS", - "name": "vRRaaS", + "id": "vTerrance", + "name": "vTerrance", "isPermitted": true }, { @@ -1654,7 +1663,7 @@ }, { "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "name": "Mobility", + "name": "Emanuel", "isPermitted": true }, { @@ -1664,7 +1673,7 @@ }, { "id": "db171b8f-115c-4992-a2e3-ee04cae357e0", - "name": "FIRSTNET", + "name": "LINDSEY", "isPermitted": true }, { @@ -1673,18 +1682,18 @@ "isPermitted": true }, { - "id": "vHNGWaas", + "id": "vRosemarie", "name": "HNGATEWAY", "isPermitted": true }, { "id": "vHNPaas", - "name": "HNPORTAL", + "name": "WILKINS", "isPermitted": true }, { "id": "e433710f-9217-458d-a79d-1c7aff376d89", - "name": "VIRTUAL USP", + "name": "TYLER SILVIA", "isPermitted": true }, { @@ -1693,18 +1702,18 @@ "isPermitted": true }, { - "id": "VIPRaaS", - "name": "vIPRaaS", + "id": "Cisneros", + "name": "vMuriel", "isPermitted": true }, { "id": "0ee8c1bc-7cbd-4b0a-a1ac-e9999255abc1", - "name": "WAN Bonding", + "name": "CARA Griffin", "isPermitted": true }, { "id": "c7611ebe-c324-48f1-8085-94aef0c6ef3d", - "name": "HOSTED COMMUNICATIONS", + "name": "DARREN MCGEE", "isPermitted": true }, { @@ -1713,23 +1722,23 @@ "isPermitted": true }, { - "id": "vVIGaaS", - "name": "vVIGaaS", + "id": "vSalvatore", + "name": "vSalvatore", "isPermitted": true }, { "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4", - "name": "uCPE-VMS", + "name": "Josefina", "isPermitted": true }, { - "id": "vPEaaS", - "name": "vPEaaS", + "id": "vHubbard", + "name": "vHubbard", "isPermitted": true }, { "id": "12a96a9d-4b4c-4349-a950-fe1159602621", - "name": "HOSTED COMMUNICATIONS", + "name": "DARREN MCGEE", "isPermitted": true } ], @@ -1737,22 +1746,22 @@ "e433710f-9217-458d-a79d-1c7aff376d89": [ { "id": "0", - "name": "vFlowLogic", + "name": "vRichardson", "isPermitted": false }, { "id": "1", - "name": "VIRTUAL USP", + "name": "TYLER SILVIA", "isPermitted": true }, { "id": "2", - "name": "Mobility", + "name": "Emanuel", "isPermitted": false }, { "id": "3", - "name": "vBNG", + "name": "vJamie", "isPermitted": false }, { @@ -1762,7 +1771,7 @@ }, { "id": "5", - "name": "Nimbus", + "name": "Kennedy", "isPermitted": false }, { @@ -1817,17 +1826,17 @@ }, { "id": "16", - "name": "FIRSTNET", + "name": "LINDSEY", "isPermitted": false }, { "id": "17", - "name": "ACTIVE_CHARGE", + "name": "JOHANNA_SANTOS", "isPermitted": false }, { "id": "18", - "name": "vHSS", + "name": "vCarroll", "isPermitted": false } ] @@ -2610,17 +2619,17 @@ }, { "id": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", - "name": "MetroPacketCore" + "name": "WayneHolland" }, { - "id": "Wireline", - "name": "Wireline" + "id": "Melissa", + "name": "Melissa" } ], "projectList": [ { - "id": "DFW", - "name": "DFW" + "id": "WATKINS", + "name": "WATKINS" }, { "id": "x1", @@ -2633,8 +2642,8 @@ ], "lineOfBusinessList": [ { - "id": "ECOMP", - "name": "ECOMP" + "id": "ONAP", + "name": "ONAP" }, { "id": "zzz1", diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.json index a2e154308..b8c3136f0 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.json +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/flags.json @@ -1,15 +1,23 @@ { - "FLAG_ADVANCED_PORTS_FILTER": true, "CREATE_INSTANCE_TEST": false, "EMPTY_DRAWING_BOARD_TEST": false, - "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": true, - "FLAG_REGION_ID_FROM_REMOTE": true, + "FLAG_NETWORK_TO_ASYNC_INSTANTIATION": false, "FLAG_ASYNC_INSTANTIATION": true, "FLAG_ASYNC_JOBS": true, "FLAG_ADD_MSO_TESTAPI_FIELD": true, "FLAG_UNASSIGN_SERVICE": false, "FLAG_SERVICE_MODEL_CACHE": false, "FLAG_COLLECTION_RESOURCE_SUPPORT": true, - "FLAG_SHOW_ASSIGNMENTS": true - + "FLAG_SHOW_ASSIGNMENTS": true, + "FLAG_FABRIC_CONFIGURATION_ASSIGNMENTS": true, + "FLAG_DUPLICATE_VNF":true, + "FLAG_DEFAULT_VNF" : true, + "FLAG_SETTING_DEFAULTS_IN_DRAWING_BOARD" : true, + "FLAG_A_LA_CARTE_AUDIT_INFO": true, + "FLAG_1810_CR_ADD_CLOUD_OWNER_TO_MSO_REQUEST": true, + "FLAG_PRESENT_PROVIDER_NETWORKS_ASSOCIATIONS": true, + "FLAG_1810_CR_SOFT_DELETE_ALACARTE_VF_MODULE": true, + "FLAG_1902_NEW_VIEW_EDIT": true, + "FLAG_VF_MODULE_RESUME_STATUS_CREATE" : true, + "FLAG_1906_COMPONENT_INFO": true } diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/responceForFailedInstance.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/responceForFailedInstance.json new file mode 100644 index 000000000..8e5c23689 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/responceForFailedInstance.json @@ -0,0 +1,12 @@ +{ + "id":null, + "jobId":null, + "instanceName":null, + "instanceType":null, + "jobStatus":"FAILED", + "source":null, + "requestId":null, + "additionalInfo":"Http Code:500, RAW DATA FROM MSO", + "final":false, + "createdDate":1549198388000 +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/service.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/service.json index 3da9015ad..5cb1c8655 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/service.json +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/service.json @@ -30,16 +30,16 @@ "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9", "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF", "int_ctl_net_name": "VMX-INTXI", - "vmx_int_ctl_prefix": "128.0.0.0", + "vmx_int_ctl_prefix": "10.0.0.10", "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5", "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279", "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a", "nf_type": "vPE", - "vmxvpfe_int_ctl_ip_1": "128.0.0.16", + "vmxvpfe_int_ctl_ip_1": "10.0.0.10", "is_AVPN_service": "false", "vmx_RSG_name": "vREXI-affinity", "vmx_int_ctl_forwarding": "l2", - "vmxvre_oam_ip_0": "10.40.123.5", + "vmxvre_oam_ip_0": "10.0.0.10", "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF", "vmxvpfe_sriov41_0_port_vlanstrip": "false", "vmxvpfe_sriov42_0_port_vlanfilter": "4001", @@ -68,7 +68,7 @@ "vf_module_id": "123", "nf_function": "JAI", "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true", - "vmxvre_int_ctl_ip_0": "128.0.0.1", + "vmxvre_int_ctl_ip_0": "10.0.0.10", "ecomp_generated_naming": "true", "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI", "vnf_name": "mtnj309me6vre", @@ -90,7 +90,7 @@ "vmxvre_volume_size_0": "45.0", "vmxvre_volume_size_1": "50.0", "vmxvpfe_sriov42_0_port_broadcastallow": "true", - "vmxvre_oam_gateway": "10.40.123.1", + "vmxvre_oam_gateway": "10.0.0.10", "vmxvre_volume_name_1": "vREXI_FAVolume", "vmxvre_ore_present": "0", "vmxvre_volume_name_0": "vREXI_FBVolume", @@ -130,16 +130,16 @@ "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9", "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF", "int_ctl_net_name": "VMX-INTXI", - "vmx_int_ctl_prefix": "128.0.0.0", + "vmx_int_ctl_prefix": "10.0.0.10", "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5", "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279", "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a", "nf_type": "vPE", - "vmxvpfe_int_ctl_ip_1": "128.0.0.16", + "vmxvpfe_int_ctl_ip_1": "10.0.0.10", "is_AVPN_service": "false", "vmx_RSG_name": "vREXI-affinity", "vmx_int_ctl_forwarding": "l2", - "vmxvre_oam_ip_0": "10.40.123.5", + "vmxvre_oam_ip_0": "10.0.0.10", "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF", "vmxvpfe_sriov41_0_port_vlanstrip": "false", "vmxvpfe_sriov42_0_port_vlanfilter": "4001", @@ -168,7 +168,7 @@ "vf_module_id": "123", "nf_function": "JAI", "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true", - "vmxvre_int_ctl_ip_0": "128.0.0.1", + "vmxvre_int_ctl_ip_0": "10.0.0.10", "ecomp_generated_naming": "true", "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI", "vnf_name": "mtnj309me6vre", @@ -190,7 +190,7 @@ "vmxvre_volume_size_0": "45.0", "vmxvre_volume_size_1": "50.0", "vmxvpfe_sriov42_0_port_broadcastallow": "true", - "vmxvre_oam_gateway": "10.40.123.1", + "vmxvre_oam_gateway": "10.0.0.10", "vmxvre_volume_name_1": "vREXI_FAVolume", "vmxvre_ore_present": "0", "vmxvre_volume_name_0": "vREXI_FBVolume", @@ -230,16 +230,16 @@ "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9", "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF", "int_ctl_net_name": "VMX-INTXI", - "vmx_int_ctl_prefix": "128.0.0.0", + "vmx_int_ctl_prefix": "10.0.0.10", "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5", "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279", "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a", "nf_type": "vPE", - "vmxvpfe_int_ctl_ip_1": "128.0.0.16", + "vmxvpfe_int_ctl_ip_1": "10.0.0.10", "is_AVPN_service": "false", "vmx_RSG_name": "vREXI-affinity", "vmx_int_ctl_forwarding": "l2", - "vmxvre_oam_ip_0": "10.40.123.5", + "vmxvre_oam_ip_0": "10.0.0.10", "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF", "vmxvpfe_sriov41_0_port_vlanstrip": "false", "vmxvpfe_sriov42_0_port_vlanfilter": "4001", @@ -268,7 +268,7 @@ "vf_module_id": "123", "nf_function": "JAI", "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true", - "vmxvre_int_ctl_ip_0": "128.0.0.1", + "vmxvre_int_ctl_ip_0": "10.0.0.10", "ecomp_generated_naming": "true", "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI", "vnf_name": "mtnj309me6vre", @@ -290,7 +290,7 @@ "vmxvre_volume_size_0": "45.0", "vmxvre_volume_size_1": "50.0", "vmxvpfe_sriov42_0_port_broadcastallow": "true", - "vmxvre_oam_gateway": "10.40.123.1", + "vmxvre_oam_gateway": "10.0.0.10", "vmxvre_volume_name_1": "vREXI_FAVolume", "vmxvre_ore_present": "0", "vmxvre_volume_name_0": "vREXI_FBVolume", diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json new file mode 100644 index 000000000..d34da2bea --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/ecompNamingFalseModel.json @@ -0,0 +1,1065 @@ +{ + "service": { + "uuid": "6b528779-44a3-4472-bdff-9cd15ec93450", + "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "name": "action-data", + "version": "1.0", + "toscaModelURL": null, + "category": "", + "serviceType": "", + "serviceRole": "", + "description": "", + "serviceEcompNaming": "false", + "instantiationType": "Macro", + "inputs": { + "2017488_adiodvpe0_ASN": { + "type": "string", + "description": "AV/PE", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "AV_vPE" + } + }, + "vidNotions": { + "instantiationUI": "legacy", + "modelCategory": "other" + } + }, + "vnfs": { + "2017-388_ADIOD-vPE 1": { + "uuid": "0903e1c0-8e03-4936-b5c2-260653b96413", + "invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d", + "description": "Name ADIOD vPE Description The provider edge function for the ADIOD service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM", + "name": "2017-388_ADIOD-vPE", + "version": "1.0", + "customizationUuid": "280dec31-f16d-488b-9668-4aae55d6648a", + "inputs": { + "vnf_config_template_version": { + "type": "string", + "description": "VPE Software Version", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "17.2" + }, + "bandwidth_units": { + "type": "string", + "description": "Units of bandwidth", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "Gbps" + }, + "bandwidth": { + "type": "string", + "description": "Requested VPE bandwidth", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "10" + }, + "AIC_CLLI": { + "type": "string", + "description": "AIC Site CLLI", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "ATLMY8GA" + }, + "ASN": { + "type": "string", + "description": "AV/PE", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "AV_vPE" + }, + "vnf_instance_name": { + "type": "string", + "description": "The hostname assigned to the vpe.", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "mtnj309me6" + } + }, + "commands": { + "vnf_config_template_version": { + "displayName": "vnf_config_template_version", + "command": "get_input", + "inputName": "2017488_adiodvpe0_vnf_config_template_version" + }, + "bandwidth_units": { + "displayName": "bandwidth_units", + "command": "get_input", + "inputName": "adiodvpe0_bandwidth_units" + }, + "bandwidth": { + "displayName": "bandwidth", + "command": "get_input", + "inputName": "adiodvpe0_bandwidth" + }, + "AIC_CLLI": { + "displayName": "AIC_CLLI", + "command": "get_input", + "inputName": "2017488_adiodvpe0_AIC_CLLI" + }, + "ASN": { + "displayName": "ASN", + "command": "get_input", + "inputName": "2017488_adiodvpe0_ASN" + }, + "vnf_instance_name": { + "displayName": "vnf_instance_name", + "command": "get_input", + "inputName": "2017488_adiodvpe0_vnf_instance_name" + } + }, + "properties": { + "vmxvre_retype": "RE-VMX", + "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version", + "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d", + "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9", + "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF", + "int_ctl_net_name": "VMX-INTXI", + "vmx_int_ctl_prefix": "10.0.0.10", + "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5", + "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279", + "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a", + "nf_type": "vPE", + "vmxvpfe_int_ctl_ip_1": "10.0.0.10", + "is_AVPN_service": "false", + "vmx_RSG_name": "vREXI-affinity", + "vmx_int_ctl_forwarding": "l2", + "vmxvre_oam_ip_0": "10.0.0.10", + "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF", + "vmxvpfe_sriov41_0_port_vlanstrip": "false", + "vmxvpfe_sriov42_0_port_vlanfilter": "4001", + "vmxvpfe_sriov44_0_port_unknownunicastallow": "true", + "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2", + "vmxvre_instance": "0", + "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF", + "vmxvre_flavor_name": "ns.c1r16d32.v5", + "vmxvpfe_volume_size_0": "40.0", + "vmxvpfe_sriov43_0_port_vlanfilter": "4001", + "nf_naming": "{ecomp_generated_naming=false}", + "nf_naming_code": "Navneet", + "vmxvre_name_0": "vREXI", + "vmxvpfe_sriov42_0_port_vlanstrip": "false", + "vmxvpfe_volume_name_0": "vPFEXI_FBVolume", + "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141", + "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2", + "vmxvpfe_sriov43_0_port_unknownunicastallow": "true", + "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true", + "vmxvre_console": "vidconsole", + "vmxvpfe_sriov44_0_port_vlanfilter": "4001", + "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF", + "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3", + "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true", + "vmxvpfe_sriov44_0_port_vlanstrip": "false", + "vf_module_id": "123", + "nf_function": "JAI", + "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true", + "vmxvre_int_ctl_ip_0": "10.0.0.10", + "ecomp_generated_naming": "false", + "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI", + "vnf_name": "mtnj309me6vre", + "vmxvpfe_sriov41_0_port_unknownunicastallow": "true", + "vmxvre_volume_type_1": "HITACHI", + "vmxvpfe_sriov44_0_port_broadcastallow": "true", + "vmxvre_volume_type_0": "HITACHI", + "vmxvpfe_volume_type_0": "HITACHI", + "vmxvpfe_sriov43_0_port_broadcastallow": "true", + "bandwidth_units": "get_input:adiodvpe0_bandwidth_units", + "vnf_id": "123", + "vmxvre_oam_prefix": "24", + "availability_zone_0": "mtpocfo-kvm-az01", + "ASN": "get_input:2017488_adiodvpe0_ASN", + "vmxvre_chassis_i2cid": "161", + "vmxvpfe_name_0": "vPFEXI", + "bandwidth": "get_input:adiodvpe0_bandwidth", + "availability_zone_max_count": "1", + "vmxvre_volume_size_0": "45.0", + "vmxvre_volume_size_1": "50.0", + "vmxvpfe_sriov42_0_port_broadcastallow": "true", + "vmxvre_oam_gateway": "10.0.0.10", + "vmxvre_volume_name_1": "vREXI_FAVolume", + "vmxvre_ore_present": "0", + "vmxvre_volume_name_0": "vREXI_FBVolume", + "vmxvre_type": "0", + "vnf_instance_name": "get_input:2017488_adiodvpe0_vnf_instance_name", + "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true", + "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429", + "vmx_int_ctl_len": "24", + "vmxvpfe_sriov43_0_port_vlanstrip": "false", + "vmxvpfe_sriov41_0_port_broadcastallow": "true", + "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d", + "vmxvpfe_sriov41_0_port_vlanfilter": "4001", + "nf_role": "Testing", + "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a", + "vmxvpfe_sriov42_0_port_unknownunicastallow": "true", + "vmxvpfe_flavor_name": "ns.c20r16d25.v5" + }, + "type": "VF", + "modelCustomizationName": "2017-388_ADIOD-vPE 1", + "vfModules": {}, + "volumeGroups": {}, + "vfcInstanceGroups": {} + }, + "2017-388_ADIOD-vPE 0": { + "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168", + "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "description": "Name ADIOD vPE Description The provider edge function for the ADIOD service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM", + "name": "2017-388_ADIOD-vPE", + "version": "4.0", + "customizationUuid": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c", + "inputs": { + "vnf_config_template_version": { + "type": "string", + "description": "VPE Software Version", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "17.2" + }, + "bandwidth_units": { + "type": "string", + "description": "Units of bandwidth", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "Gbps" + }, + "bandwidth": { + "type": "string", + "description": "Requested VPE bandwidth", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "10" + }, + "AIC_CLLI": { + "type": "string", + "description": "AIC Site CLLI", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "ATLMY8GA" + }, + "ASN": { + "type": "string", + "description": "AV/PE", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "AV_vPE" + }, + "vnf_instance_name": { + "type": "string", + "description": "The hostname assigned to the vpe.", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "mtnj309me6" + } + }, + "commands": { + "vnf_config_template_version": { + "displayName": "vnf_config_template_version", + "command": "get_input", + "inputName": "2017488_adiodvpe0_vnf_config_template_version" + }, + "bandwidth_units": { + "displayName": "bandwidth_units", + "command": "get_input", + "inputName": "adiodvpe0_bandwidth_units" + }, + "bandwidth": { + "displayName": "bandwidth", + "command": "get_input", + "inputName": "adiodvpe0_bandwidth" + }, + "AIC_CLLI": { + "displayName": "AIC_CLLI", + "command": "get_input", + "inputName": "2017488_adiodvpe0_AIC_CLLI" + }, + "ASN": { + "displayName": "ASN", + "command": "get_input", + "inputName": "2017488_adiodvpe0_ASN" + }, + "vnf_instance_name": { + "displayName": "vnf_instance_name", + "command": "get_input", + "inputName": "2017488_adiodvpe0_vnf_instance_name" + } + }, + "properties": { + "vmxvre_retype": "RE-VMX", + "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version", + "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d", + "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9", + "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF", + "int_ctl_net_name": "VMX-INTXI", + "vmx_int_ctl_prefix": "10.0.0.10", + "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5", + "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279", + "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a", + "nf_type": "vPE", + "vmxvpfe_int_ctl_ip_1": "10.0.0.10", + "is_AVPN_service": "false", + "vmx_RSG_name": "vREXI-affinity", + "vmx_int_ctl_forwarding": "l2", + "vmxvre_oam_ip_0": "10.0.0.10", + "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF", + "vmxvpfe_sriov41_0_port_vlanstrip": "false", + "vmxvpfe_sriov42_0_port_vlanfilter": "4001", + "vmxvpfe_sriov44_0_port_unknownunicastallow": "true", + "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2", + "vmxvre_instance": "0", + "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF", + "vmxvre_flavor_name": "ns.c1r16d32.v5", + "vmxvpfe_volume_size_0": "40.0", + "vmxvpfe_sriov43_0_port_vlanfilter": "4001", + "nf_naming": "{ecomp_generated_naming=false}", + "nf_naming_code": "Navneet", + "vmxvre_name_0": "vREXI", + "vmxvpfe_sriov42_0_port_vlanstrip": "false", + "vmxvpfe_volume_name_0": "vPFEXI_FBVolume", + "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141", + "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2", + "vmxvpfe_sriov43_0_port_unknownunicastallow": "true", + "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true", + "vmxvre_console": "vidconsole", + "vmxvpfe_sriov44_0_port_vlanfilter": "4001", + "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF", + "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3", + "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true", + "min_instances": "1", + "vmxvpfe_sriov44_0_port_vlanstrip": "false", + "vf_module_id": "123", + "nf_function": "JAI", + "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true", + "vmxvre_int_ctl_ip_0": "10.0.0.10", + "ecomp_generated_naming": "false", + "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI", + "vnf_name": "mtnj309me6vre", + "vmxvpfe_sriov41_0_port_unknownunicastallow": "true", + "vmxvre_volume_type_1": "HITACHI", + "vmxvpfe_sriov44_0_port_broadcastallow": "true", + "vmxvre_volume_type_0": "HITACHI", + "vmxvpfe_volume_type_0": "HITACHI", + "vmxvpfe_sriov43_0_port_broadcastallow": "true", + "bandwidth_units": "get_input:adiodvpe0_bandwidth_units", + "vnf_id": "123", + "vmxvre_oam_prefix": "24", + "availability_zone_0": "mtpocfo-kvm-az01", + "ASN": "get_input:2017488_adiodvpe0_ASN", + "vmxvre_chassis_i2cid": "161", + "vmxvpfe_name_0": "vPFEXI", + "bandwidth": "get_input:adiodvpe0_bandwidth", + "availability_zone_max_count": "1", + "vmxvre_volume_size_0": "45.0", + "vmxvre_volume_size_1": "50.0", + "vmxvpfe_sriov42_0_port_broadcastallow": "true", + "vmxvre_oam_gateway": "10.0.0.10", + "vmxvre_volume_name_1": "vREXI_FAVolume", + "vmxvre_ore_present": "0", + "vmxvre_volume_name_0": "vREXI_FBVolume", + "vmxvre_type": "0", + "vnf_instance_name": "get_input:2017488_adiodvpe0_vnf_instance_name", + "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true", + "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429", + "vmx_int_ctl_len": "24", + "vmxvpfe_sriov43_0_port_vlanstrip": "false", + "vmxvpfe_sriov41_0_port_broadcastallow": "true", + "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d", + "vmxvpfe_sriov41_0_port_vlanfilter": "4001", + "nf_role": "Testing", + "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a", + "vmxvpfe_sriov42_0_port_unknownunicastallow": "true", + "vmxvpfe_flavor_name": "ns.c20r16d25.v5" + }, + "type": "VF", + "modelCustomizationName": "2017-388_ADIOD-vPE 0", + "vfModules": {}, + "volumeGroups": {}, + "vfcInstanceGroups": {} + }, + "2017-488_ADIOD-vPE 0": { + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "description": "Name ADIOD vPE Description The provider edge function for the ADIOD service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM", + "name": "2017-488_ADIOD-vPE", + "version": "5.0", + "customizationUuid": "1da7b585-5e61-4993-b95e-8e6606c81e45", + "inputs": { + "vnf_config_template_version": { + "type": "string", + "description": "VPE Software Version", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "17.2" + }, + "bandwidth_units": { + "type": "string", + "description": "Units of bandwidth", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "Gbps" + }, + "bandwidth": { + "type": "string", + "description": "Requested VPE bandwidth", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "10" + }, + "AIC_CLLI": { + "type": "string", + "description": "AIC Site CLLI", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "ATLMY8GA" + }, + "ASN": { + "type": "string", + "description": "AV/PE", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "AV_vPE" + }, + "vnf_instance_name": { + "type": "string", + "description": "The hostname assigned to the vpe.", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "mtnj309me6" + } + }, + "commands": { + "vnf_config_template_version": { + "displayName": "vnf_config_template_version", + "command": "get_input", + "inputName": "2017488_adiodvpe0_vnf_config_template_version" + }, + "bandwidth_units": { + "displayName": "bandwidth_units", + "command": "get_input", + "inputName": "adiodvpe0_bandwidth_units" + }, + "bandwidth": { + "displayName": "bandwidth", + "command": "get_input", + "inputName": "adiodvpe0_bandwidth" + }, + "AIC_CLLI": { + "displayName": "AIC_CLLI", + "command": "get_input", + "inputName": "2017488_adiodvpe0_AIC_CLLI" + }, + "ASN": { + "displayName": "ASN", + "command": "get_input", + "inputName": "2017488_adiodvpe0_ASN" + }, + "vnf_instance_name": { + "displayName": "vnf_instance_name", + "command": "get_input", + "inputName": "2017488_adiodvpe0_vnf_instance_name" + } + }, + "properties": { + "vmxvre_retype": "RE-VMX", + "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version", + "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d", + "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9", + "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF", + "int_ctl_net_name": "VMX-INTXI", + "vmx_int_ctl_prefix": "10.0.0.10", + "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5", + "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279", + "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a", + "nf_type": "vPE", + "vmxvpfe_int_ctl_ip_1": "10.0.0.10", + "is_AVPN_service": "false", + "vmx_RSG_name": "vREXI-affinity", + "vmx_int_ctl_forwarding": "l2", + "vmxvre_oam_ip_0": "10.0.0.10", + "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF", + "vmxvpfe_sriov41_0_port_vlanstrip": "false", + "vmxvpfe_sriov42_0_port_vlanfilter": "4001", + "vmxvpfe_sriov44_0_port_unknownunicastallow": "true", + "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2", + "vmxvre_instance": "0", + "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF", + "vmxvre_flavor_name": "ns.c1r16d32.v5", + "vmxvpfe_volume_size_0": "40.0", + "vmxvpfe_sriov43_0_port_vlanfilter": "4001", + "nf_naming": "{ecomp_generated_naming=false}", + "nf_naming_code": "Navneet", + "vmxvre_name_0": "vREXI", + "vmxvpfe_sriov42_0_port_vlanstrip": "false", + "vmxvpfe_volume_name_0": "vPFEXI_FBVolume", + "max_instances": "3", + "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141", + "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2", + "vmxvpfe_sriov43_0_port_unknownunicastallow": "true", + "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true", + "vmxvre_console": "vidconsole", + "vmxvpfe_sriov44_0_port_vlanfilter": "4001", + "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF", + "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3", + "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true", + "min_instances": "1", + "vmxvpfe_sriov44_0_port_vlanstrip": "false", + "vf_module_id": "123", + "nf_function": "JAI", + "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true", + "vmxvre_int_ctl_ip_0": "10.0.0.10", + "ecomp_generated_naming": "false", + "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI", + "vnf_name": "mtnj309me6vre", + "vmxvpfe_sriov41_0_port_unknownunicastallow": "true", + "vmxvre_volume_type_1": "HITACHI", + "vmxvpfe_sriov44_0_port_broadcastallow": "true", + "vmxvre_volume_type_0": "HITACHI", + "vmxvpfe_volume_type_0": "HITACHI", + "vmxvpfe_sriov43_0_port_broadcastallow": "true", + "bandwidth_units": "get_input:adiodvpe0_bandwidth_units", + "vnf_id": "123", + "vmxvre_oam_prefix": "24", + "availability_zone_0": "mtpocfo-kvm-az01", + "ASN": "get_input:2017488_adiodvpe0_ASN", + "vmxvre_chassis_i2cid": "161", + "vmxvpfe_name_0": "vPFEXI", + "bandwidth": "get_input:adiodvpe0_bandwidth", + "availability_zone_max_count": "1", + "vmxvre_volume_size_0": "45.0", + "vmxvre_volume_size_1": "50.0", + "vmxvpfe_sriov42_0_port_broadcastallow": "true", + "vmxvre_oam_gateway": "10.0.0.10", + "vmxvre_volume_name_1": "vREXI_FAVolume", + "vmxvre_ore_present": "0", + "vmxvre_volume_name_0": "vREXI_FBVolume", + "vmxvre_type": "0", + "vnf_instance_name": "get_input:2017488_adiodvpe0_vnf_instance_name", + "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true", + "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429", + "vmx_int_ctl_len": "24", + "vmxvpfe_sriov43_0_port_vlanstrip": "false", + "vmxvpfe_sriov41_0_port_broadcastallow": "true", + "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d", + "vmxvpfe_sriov41_0_port_vlanfilter": "4001", + "nf_role": "Testing", + "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a", + "vmxvpfe_sriov42_0_port_unknownunicastallow": "true", + "vmxvpfe_flavor_name": "ns.c20r16d25.v5" + }, + "type": "VF", + "modelCustomizationName": "2017-488_ADIOD-vPE 0", + "vfModules": { + "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": { + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5", + "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", + "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "description": null, + "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", + "version": "6", + "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "ADIOD_vRE_BV", + "baseModule": false + }, + "inputs": { + "vnf_config_template_version": { + "type": "string", + "description": "VPE Software Version", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "vnf_config_template_version" + }, + "fromInputName": "2017488_adiodvpe0_vnf_config_template_version", + "constraints": null, + "required": true, + "default": "17.2" + }, + "bandwidth_units": { + "type": "string", + "description": "Units of bandwidth", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "bandwidth_units" + }, + "fromInputName": "adiodvpe0_bandwidth_units", + "constraints": null, + "required": true, + "default": "Gbps" + }, + "bandwidth": { + "type": "string", + "description": "Requested VPE bandwidth", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "bandwidth" + }, + "fromInputName": "adiodvpe0_bandwidth", + "constraints": null, + "required": true, + "default": "10" + }, + "AIC_CLLI": { + "type": "string", + "description": "AIC Site CLLI", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "AIC_CLLI" + }, + "fromInputName": "2017488_adiodvpe0_AIC_CLLI", + "constraints": null, + "required": true, + "default": "ATLMY8GA" + }, + "vnf_instance_name": { + "type": "string", + "description": "The hostname assigned to the vpe.", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "vnf_instance_name" + }, + "fromInputName": "2017488_adiodvpe0_vnf_instance_name", + "constraints": null, + "required": true, + "default": "mtnj309me6" + } + }, + "volumeGroupAllowed": true + }, + "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": { + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091", + "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", + "description": null, + "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0", + "version": "5", + "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "ADIOD_base_vPE_BV", + "baseModule": true + }, + "inputs": {}, + "volumeGroupAllowed": false + }, + "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": { + "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a", + "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339", + "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557", + "description": null, + "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", + "version": "6", + "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "ADIOD_vPFE_BV", + "baseModule": false + }, + "inputs": {}, + "volumeGroupAllowed": true + } + }, + "volumeGroups": { + "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": { + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5", + "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", + "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "description": null, + "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", + "version": "6", + "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "ADIOD_vRE_BV", + "baseModule": false + }, + "inputs": { + "vnf_config_template_version": { + "type": "string", + "description": "VPE Software Version", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "vnf_config_template_version" + }, + "fromInputName": "2017488_adiodvpe0_vnf_config_template_version", + "constraints": null, + "required": true, + "default": "17.2" + }, + "bandwidth_units": { + "type": "string", + "description": "Units of bandwidth", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "bandwidth_units" + }, + "fromInputName": "adiodvpe0_bandwidth_units", + "constraints": null, + "required": true, + "default": "Gbps" + }, + "bandwidth": { + "type": "string", + "description": "Requested VPE bandwidth", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "bandwidth" + }, + "fromInputName": "adiodvpe0_bandwidth", + "constraints": null, + "required": true, + "default": "10" + }, + "AIC_CLLI": { + "type": "string", + "description": "AIC Site CLLI", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "AIC_CLLI" + }, + "fromInputName": "2017488_adiodvpe0_AIC_CLLI", + "constraints": null, + "required": true, + "default": "ATLMY8GA" + }, + "vnf_instance_name": { + "type": "string", + "description": "The hostname assigned to the vpe.", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "vnf_instance_name" + }, + "fromInputName": "2017488_adiodvpe0_vnf_instance_name", + "constraints": null, + "required": true, + "default": "mtnj309me6" + } + } + }, + "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": { + "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a", + "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339", + "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557", + "description": null, + "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", + "version": "6", + "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "ADIOD_vPFE_BV", + "baseModule": false + }, + "inputs": {} + } + }, + "vfcInstanceGroups": {} + } + }, + "networks": {}, + "collectionResource": {}, + "configurations": {}, + "fabricConfigurations": {}, + "serviceProxies": {}, + "vfModules": { + "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": { + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5", + "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", + "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "description": null, + "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", + "version": "6", + "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "ADIOD_vRE_BV", + "baseModule": false + }, + "inputs": { + "vnf_config_template_version": { + "type": "string", + "description": "VPE Software Version", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "vnf_config_template_version" + }, + "fromInputName": "2017488_adiodvpe0_vnf_config_template_version", + "constraints": null, + "required": true, + "default": "17.2" + }, + "bandwidth_units": { + "type": "string", + "description": "Units of bandwidth", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "bandwidth_units" + }, + "fromInputName": "adiodvpe0_bandwidth_units", + "constraints": null, + "required": true, + "default": "Gbps" + }, + "bandwidth": { + "type": "string", + "description": "Requested VPE bandwidth", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "bandwidth" + }, + "fromInputName": "adiodvpe0_bandwidth", + "constraints": null, + "required": true, + "default": "10" + }, + "AIC_CLLI": { + "type": "string", + "description": "AIC Site CLLI", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "AIC_CLLI" + }, + "fromInputName": "2017488_adiodvpe0_AIC_CLLI", + "constraints": null, + "required": true, + "default": "ATLMY8GA" + }, + "vnf_instance_name": { + "type": "string", + "description": "The hostname assigned to the vpe.", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "vnf_instance_name" + }, + "fromInputName": "2017488_adiodvpe0_vnf_instance_name", + "constraints": null, + "required": true, + "default": "mtnj309me6" + } + }, + "volumeGroupAllowed": true + }, + "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": { + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091", + "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", + "description": null, + "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0", + "version": "5", + "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "ADIOD_base_vPE_BV", + "baseModule": true + }, + "inputs": {}, + "volumeGroupAllowed": false + }, + "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": { + "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a", + "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339", + "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557", + "description": null, + "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", + "version": "6", + "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "ADIOD_vPFE_BV", + "baseModule": false + }, + "inputs": {}, + "volumeGroupAllowed": true + } + }, + "volumeGroups": { + "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": { + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5", + "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", + "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "description": null, + "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", + "version": "6", + "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "ADIOD_vRE_BV", + "baseModule": false + }, + "inputs": { + "vnf_config_template_version": { + "type": "string", + "description": "VPE Software Version", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "vnf_config_template_version" + }, + "fromInputName": "2017488_adiodvpe0_vnf_config_template_version", + "constraints": null, + "required": true, + "default": "17.2" + }, + "bandwidth_units": { + "type": "string", + "description": "Units of bandwidth", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "bandwidth_units" + }, + "fromInputName": "adiodvpe0_bandwidth_units", + "constraints": null, + "required": true, + "default": "Gbps" + }, + "bandwidth": { + "type": "string", + "description": "Requested VPE bandwidth", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "bandwidth" + }, + "fromInputName": "adiodvpe0_bandwidth", + "constraints": null, + "required": true, + "default": "10" + }, + "AIC_CLLI": { + "type": "string", + "description": "AIC Site CLLI", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "AIC_CLLI" + }, + "fromInputName": "2017488_adiodvpe0_AIC_CLLI", + "constraints": null, + "required": true, + "default": "ATLMY8GA" + }, + "vnf_instance_name": { + "type": "string", + "description": "The hostname assigned to the vpe.", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "vnf_instance_name" + }, + "fromInputName": "2017488_adiodvpe0_vnf_instance_name", + "constraints": null, + "required": true, + "default": "mtnj309me6" + } + } + }, + "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": { + "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a", + "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339", + "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557", + "description": null, + "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", + "version": "6", + "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "ADIOD_vPFE_BV", + "baseModule": false + }, + "inputs": {} + } + }, + "pnfs": {} +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/serviceForNewViewEdit.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/serviceForNewViewEdit.json new file mode 100644 index 000000000..a749e5787 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceModels/serviceForNewViewEdit.json @@ -0,0 +1,130 @@ +{ + "service": { + "uuid": "a1531622-4e08-43fa-9ffd-222090cab7d2", + "invariantUuid": "c54c1178-ab4b-498c-aea0-52cc2043d44f", + "name": "mdns_2017_1011_IST_Service", + "version": "5.0", + "toscaModelURL": null, + "category": "Emanuel", + "serviceType": "", + "serviceRole": "", + "description": "mdns_2017_1011_IST_Service -Creating Service for PID 298109a", + "serviceEcompNaming": "true", + "instantiationType": "ClientConfig", + "inputs": {}, + "vidNotions": { + "instantiationUI": "serviceWithVnfGrouping", + "modelCategory": "other", + "viewEditUI" : "serviceWithVnfGrouping" + } + }, + "vnfs": { + "mdns_2017_1011_IST_Vf 0": { + "uuid": "e54ac8ab-746b-494d-918a-efab23a50e0d", + "invariantUuid": "b22715a2-4ec1-4e2f-bf4f-d79fa9519707", + "description": "mdns_2017_1011_IST_Vf -Creating for PID 298109a", + "name": "mdns_2017_1011_IST_Vf", + "version": "4.0", + "customizationUuid": "efa526df-e1f5-4fda-9e0d-475cb5e44e4f", + "inputs": {}, + "commands": {}, + "properties": { + "nf_naming": "{naming_policy=gw1218.Config_MS_VmVnfcNamingPolicyMobility1710.*, ecomp_generated_naming=true}", + "multi_stage_design": "false", + "availability_zone_max_count": "1", + "ecomp_generated_naming": "true", + "node_count": "4.0", + "dns_image_name": "NIMBUS_MDNS_3.0.4.qcow2", + "route_eth0": "135.144.38.211/32 via 107.239.83.1 dev eth0 155.165.201.253/32 via 107.239.83.1 dev eth0 141.204.0.0/16 via 107.239.83.1 dev eth0 ", + "dns_flavor_name": "nv.c4r4d80" + }, + "type": "VF", + "modelCustomizationName": "mdns_2017_1011_IST_Vf 0", + "vfModules": { + "mdns_2017_1011_ist_vf0..Mdns20171011IstVf..base_dns..module-0": { + "uuid": "1259fe65-4112-44ab-a622-cc9f99296c90", + "invariantUuid": "0be2f9a6-889a-45bd-9ba5-13ef9f62474b", + "customizationUuid": "89200091-4583-4f01-bc2b-aade7a0eb6de", + "description": null, + "name": "Mdns20171011IstVf..base_dns..module-0", + "version": "1", + "modelCustomizationName": "Mdns20171011IstVf..base_dns..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "base_dns", + "baseModule": true + }, + "inputs": {}, + "volumeGroupAllowed": false + }, + "mdns_2017_1011_ist_vf0..Mdns20171011IstVf..dns_az_01..module-1": { + "uuid": "c921c0dd-4f02-4b1e-8234-063675955c45", + "invariantUuid": "3744764d-32a1-468f-801d-2fc2485dc159", + "customizationUuid": "a86c56b6-7d7d-4bc1-b60f-ea384cadd232", + "description": null, + "name": "Mdns20171011IstVf..dns_az_01..module-1", + "version": "1", + "modelCustomizationName": "Mdns20171011IstVf..dns_az_01..module-1", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "dns_az_01", + "baseModule": false + }, + "inputs": {}, + "volumeGroupAllowed": false + } + }, + "volumeGroups": {}, + "vfcInstanceGroups": {} + } + }, + "networks": {}, + "collectionResource": {}, + "configurations": {}, + "fabricConfigurations": {}, + "serviceProxies": {}, + "vfModules": { + "mdns_2017_1011_ist_vf0..Mdns20171011IstVf..base_dns..module-0": { + "uuid": "1259fe65-4112-44ab-a622-cc9f99296c90", + "invariantUuid": "0be2f9a6-889a-45bd-9ba5-13ef9f62474b", + "customizationUuid": "89200091-4583-4f01-bc2b-aade7a0eb6de", + "description": null, + "name": "Mdns20171011IstVf..base_dns..module-0", + "version": "1", + "modelCustomizationName": "Mdns20171011IstVf..base_dns..module-0", + "properties": { + "minCountInstances": 1, + "maxCountInstances": 1, + "initialCount": 1, + "vfModuleLabel": "base_dns", + "baseModule": true + }, + "inputs": {}, + "volumeGroupAllowed": false + }, + "mdns_2017_1011_ist_vf0..Mdns20171011IstVf..dns_az_01..module-1": { + "uuid": "c921c0dd-4f02-4b1e-8234-063675955c45", + "invariantUuid": "3744764d-32a1-468f-801d-2fc2485dc159", + "customizationUuid": "a86c56b6-7d7d-4bc1-b60f-ea384cadd232", + "description": null, + "name": "Mdns20171011IstVf..dns_az_01..module-1", + "version": "1", + "modelCustomizationName": "Mdns20171011IstVf..dns_az_01..module-1", + "properties": { + "minCountInstances": 0, + "maxCountInstances": null, + "initialCount": 0, + "vfModuleLabel": "dns_az_01", + "baseModule": false + }, + "inputs": {}, + "volumeGroupAllowed": false + } + }, + "volumeGroups": {}, + "pnfs": {} +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithNetwork/aaiServiceInstances.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithNetwork/aaiServiceInstances.json new file mode 100644 index 000000000..b195be57d --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithNetwork/aaiServiceInstances.json @@ -0,0 +1,14 @@ +{ + "service-instances": [ + { + "serviceInstanceId": "9cdd1b2a-43a7-47bc-a88e-759ba2399f0b", + "globalCustomerId": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "serviceType": "vMOG", + "serviceInstanceName": "Network_repl_vMOG_rk", + "subscriberName": "Emanuel", + "aaiModelInvariantId": "92a72881-0a97-4d16-8c29-4831062e7e9b", + "aaiModelVersionId": "5a3ad576-c01d-4bed-8194-0e72b4a3d020", + "isPermitted": true + } + ] +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithNetwork/aaiSubDetailsForServiceWithNetwork.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithNetwork/aaiSubDetailsForServiceWithNetwork.json new file mode 100644 index 000000000..b447e1d58 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithNetwork/aaiSubDetailsForServiceWithNetwork.json @@ -0,0 +1,290 @@ +{ + "global-customer-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "subscriber-name": "Emanuel", + "subscriber-type": "INFRA", + "resource-version": "1494001894192", + "service-subscriptions": { + "service-subscription": [ + { + "service-type": "vMOG", + "resource-version": "1494001922173", + "service-instances": { + "service-instance": [ + { + "service-instance-id": "8fa0d88e-5032-44bd-9b20-aa4ae6a367e9", + "service-instance-name": "portmirror123", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1518423771488", + "orchestration-status": "Active", + "model-invariant-id": "a1ac367e-3f20-43cb-801e-5cb381aef876", + "model-version-id": "bf0b17cd-8d34-423f-898f-197e1e1f28d3" + }, + { + "service-instance-id": "b1dd14d1-4c8c-4c34-a96e-2064647ff57b", + "service-instance-name": "testing1", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1498998455761", + "orchestration-status": "Active", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb" + }, + { + "service-instance-id": "5da732cc-548a-4732-ad2c-e7e7af3bcb85", + "service-instance-name": "aaa", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1499067629537", + "orchestration-status": "Active", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "ef4b81a1-bcff-4f97-b449-6b619b673ecb" + }, + { + "service-instance-id": "a16c64e3-dfa7-47c4-8c46-668e2030c304", + "service-instance-name": "shayTes2", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1500193374856", + "orchestration-status": "Active", + "model-invariant-id": "74b2fa72-e3b9-4942-8448-983a4b50891a", + "model-version-id": "0c4b6e10-9e86-4eeb-9794-7649a8283a88" + }, + { + "service-instance-id": "68ba015f-44d2-469a-bc1a-7e8883872047", + "service-instance-name": "cps_internal_ap7134_rk_01", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1516735672227", + "orchestration-status": "Active", + "model-invariant-id": "fa722b27-b7b1-4b55-8b4c-e2a128886707", + "model-version-id": "8022d5fb-14e7-4540-8936-e267cc85a65e" + }, + { + "service-instance-id": "6293cd8e-ccc8-4280-9090-0d70212e3bc7", + "service-instance-name": "test_instance_123", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1526474108399", + "orchestration-status": "Active", + "model-invariant-id": "2fa617d0-50b3-4d74-861d-4b39301acd2c", + "model-version-id": "ae5d24f4-f602-46d0-9a62-ed3f28928b50" + }, + { + "service-instance-id": "38ecafec-3866-4761-8a8c-fc494ef113ab", + "service-instance-name": "AMIR-VLAT-TEST1", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1529827612270", + "orchestration-status": "Active", + "model-invariant-id": "a8c50d3e-4432-4995-a4f8-4ea5f8f429c5", + "model-version-id": "36408993-d5b7-4fde-85ec-a90b368bf809" + }, + { + "service-instance-id": "679e4e64-9e0d-4ece-99aa-ec6e7ff76bf4", + "service-instance-name": "test_instance_1", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1526473794492", + "orchestration-status": "Active", + "model-invariant-id": "2fa617d0-50b3-4d74-861d-4b39301acd2c", + "model-version-id": "ae5d24f4-f602-46d0-9a62-ed3f28928b50" + }, + { + "service-instance-id": "07b0e569-a3d6-4896-95d7-26329b9e1770", + "service-instance-name": "Sanity_Testing_Macro_Inst_05032018_01", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1525380034682", + "orchestration-status": "Active", + "model-invariant-id": "d7b48529-6ae2-49f0-8633-b29e7cd4d4ce", + "model-version-id": "857d46ad-f4a0-4a8f-b03b-036801962288" + }, + { + "service-instance-id": "77db498d-81bd-4915-85b7-bf9162297d55", + "service-instance-name": "RG_3-13_VidnfModel", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1520963958394", + "orchestration-status": "Active", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "5229f73d-49d5-4cff-a61c-a37b8e3b529e" + }, + { + "service-instance-id": "cea96d45-d447-4167-8c61-b201b32bc86f", + "service-instance-name": "Ayub_Sanity_Feb12", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1518459729277", + "orchestration-status": "Active", + "model-invariant-id": "35340388-0b82-4d3a-823d-cbddf842be52", + "model-version-id": "4e799efd-fd78-444d-bc25-4a3cde2f8cb0" + }, + { + "service-instance-id": "a9ef8949-d734-4521-a187-776819fa06f5", + "service-instance-name": "Testing_VNF_010", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1520003561992", + "orchestration-status": "Active", + "model-invariant-id": "70ac3517-e462-4f2a-afee-85bea7a32d3b", + "model-version-id": "c2bee847-48ba-4025-9412-100a5eb9d065" + }, + { + "service-instance-id": "7f10ffe2-548f-4168-8722-b782d05675b7", + "service-instance-name": "vMOG_SVC_UPDATED_FLAV_OAM_rk_01", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1516201909882", + "orchestration-status": "Active", + "model-invariant-id": "f959945d-7861-47d4-9230-2d1630da64a7", + "model-version-id": "e3f2698a-2d6c-434f-a9e6-486ce373cb75" + }, + { + "service-instance-id": "7b9522cd-4ca7-48dc-aa6f-1b452d218558", + "service-instance-name": "Test997_1", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1530173862887", + "orchestration-status": "Active", + "model-invariant-id": "3d8a7716-4c1d-4dff-aff6-f415ed29d169", + "model-version-id": "b24e9a7e-0f2b-45dd-8ccf-e24a0483e653" + }, + { + "service-instance-id": "e4c16d2e-ad49-4606-bfe7-e94bc6d3a65c", + "service-instance-name": "SI_Test_vidnf_10", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1496862990215", + "orchestration-status": "Active", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "8379faac-f636-4792-a583-942a963f74d3" + }, + { + "service-instance-id": "e07e88c3-f200-4740-87d4-272fa230179b", + "service-instance-name": "Viv+IST+demo+practice", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1494001827395", + "orchestration-status": null, + "model-invariant-id": "8b4b5a61-a9ba-4e93-a62d-f185fc3087f1", + "model-version-id": null + }, + { + "service-instance-id": "3039ab56-5685-4766-b89c-0e46825c30a8", + "service-instance-name": "vMOG_mm779p_Service_WA_rk_01_rk_01", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1516025801425", + "orchestration-status": "Active", + "model-invariant-id": "1a27948c-7e8f-4ddc-9d39-743728ade3e1", + "model-version-id": "fa6e6dff-070e-449b-90ff-fab42ba8aee3" + }, + { + "service-instance-id": "246a275d-da23-4f27-90a9-7b92411daa7f", + "service-instance-name": "Lital-Service-VID", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1500792529406", + "orchestration-status": "Active", + "model-invariant-id": "35eeaa7e-9b0b-458b-8e73-066d43232b6a", + "model-version-id": "cb03c617-fd15-4ba3-beab-383e3eb80964" + }, + { + "service-instance-id": "816fa49b-b217-4241-ab66-a4ebc6128670", + "service-instance-name": "test-9345349", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1508770603156", + "orchestration-status": "Active", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f" + }, + { + "service-instance-id": "6521fd4c-c5a2-4014-818b-f255b4b57941", + "service-instance-name": "Sanity_Test_Feb12", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1518461825378", + "orchestration-status": "Active", + "model-invariant-id": "709d1be4-9a3f-4a29-8c4d-a20465e808a3", + "model-version-id": "418f32e5-484a-4073-8fa9-fab7d497459f" + }, + { + "service-instance-id": "7a0143f2-9642-4578-a067-e0a5d9c8046c", + "service-instance-name": "vMOG_Network_OAM_rk_01", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1516741188293", + "orchestration-status": "Active", + "model-invariant-id": "862cda6c-d512-4979-8411-9927d944011c", + "model-version-id": "c0693f19-4d66-45ba-b53e-594314c915a4" + }, + { + "service-instance-id": "a8ba2fc3-21d2-4853-b94e-f516bee76a66", + "service-instance-name": "test_macro_instantiation_01", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1518468689517", + "orchestration-status": "Active", + "model-invariant-id": "d27e42cf-087e-4d31-88ac-6c4b7585f800", + "model-version-id": "4d71990b-d8ad-4510-ac61-496288d9078e" + }, + { + "service-instance-id": "13695dfb-db99-4c2f-905e-fe7bf2fc7b9f", + "service-instance-name": "FIRSTNET_DEMO", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1520879927295", + "orchestration-status": "Active", + "model-invariant-id": "34615cd5-3a9c-4237-81b9-cd06ff58a9a6", + "model-version-id": "a1528afd-0ebd-485a-b626-3b43000b60d1" + }, + { + "service-instance-id": "6cf3bfc6-3737-4d81-b671-2e98302c2301", + "service-instance-name": "vMOG_mm779p_Service_WA_Inst", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1520272697916", + "orchestration-status": "Active", + "model-invariant-id": "1a27948c-7e8f-4ddc-9d39-743728ade3e1", + "model-version-id": "fa6e6dff-070e-449b-90ff-fab42ba8aee3" + }, + { + "service-instance-id": "78b5ed16-ce98-4259-bb0d-e2cf7f2b8595", + "service-instance-name": "SVCTestSS", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1494001864868", + "orchestration-status": null, + "model-invariant-id": "4111e6e7-ad99-4b07-a143-e60c47295936", + "model-version-id": null + }, + { + "service-instance-id": "9ac30ab4-f4bc-4905-9175-1abf0d853008", + "service-instance-name": "RG_3-6_VMOG_ServiceInstance", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1520370735401", + "orchestration-status": "Active", + "model-invariant-id": "1a27948c-7e8f-4ddc-9d39-743728ade3e1", + "model-version-id": "fa6e6dff-070e-449b-90ff-fab42ba8aee3" + }, + { + "service-instance-id": "9cdd1b2a-43a7-47bc-a88e-759ba2399f0b", + "service-instance-name": "Network_repl_vMOG_rk", + "persona-model-id": null, + "persona-model-version": null, + "resource-version": "1516045827731", + "orchestration-status": "Active", + "model-invariant-id": "92a72881-0a97-4d16-8c29-4831062e7e9b", + "model-version-id": "5a3ad576-c01d-4bed-8194-0e72b4a3d020" + } + ] + }, + "is-permitted": true + } + + ] + } +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithNetwork/aaiSubViewEditForServiceWithNetwork.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithNetwork/aaiSubViewEditForServiceWithNetwork.json new file mode 100644 index 000000000..53f1612f2 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithNetwork/aaiSubViewEditForServiceWithNetwork.json @@ -0,0 +1,258 @@ +{ + "inventory-response-item": [ + { + "model-name": "Network_repl_vMOG", + "service-instance": { + "service-instance-id": "9cdd1b2a-43a7-47bc-a88e-759ba2399f0b", + "service-instance-name": "Network_repl_vMOG_rk" + }, + "extra-properties": {}, + "inventory-response-items": { + "inventory-response-item": [ + { + "l3-network": { + "network-id": "7989a6d2-ba10-4a5d-8f15-4520bc833090", + "network-name": "APPC-24595-T-IST-02AShared_cor_direct_net_1", + "network-type": "CONTRAIL30_BASIC", + "network-role": "repl", + "network-technology": "contrail", + "neutron-network-id": "66ee6123-1c45-4e71-b6c0-a748ae0fee88", + "is-bound-to-vpn": true, + "service-id": "db171b8f-115c-4992-a2e3-ee04cae357e0", + "network-role-instance": 0, + "resource-version": "1516046029762", + "orchestration-status": "Created", + "heat-stack-id": "APPC-24595-T-IST-02AShared_cor_direct_net_1/e8b256aa-8ce1-4384-9d99-6606eaca9eac", + "contrail-network-fqdn": "default-domain:APPC-24595-T-IST-02C:APPC-24595-T-IST-02AShared_cor_direct_net_1", + "physical-network-name": "FALSE", + "is-provider-network": false, + "is-shared-network": true, + "is-external-network": true + }, + "extra-properties": {}, + "inventory-response-items": { + "inventory-response-item": [ + { + "subnet": { + "subnet-id": "d5623e03-3927-40aa-8de4-ef46c35fc01c", + "subnet-name": "S4_rk_cor_direct", + "neutron-subnet-id": "5e34c945-812c-4d3c-b7db-d408526d58b7", + "gateway-address": "10.0.0.10", + "network-start-address": "10.0.0.10", + "cidr-mask": "25", + "ip-version": "4", + "orchestration-status": "Created", + "dhcp-enabled": false, + "dhcp-start": "", + "dhcp-end": "", + "ip-assignment-direction": "false", + "resource-version": "1516046029815" + }, + "extra-properties": {} + }, + { + "subnet": { + "subnet-id": "24921ae7-c739-4ac2-a8fe-32e8ba8a9888", + "subnet-name": "S8_rk_cor_direct", + "neutron-subnet-id": "c183255c-0a35-4420-8dbb-e96b8d989770", + "gateway-address": "2606:ae00:2e10:40::1", + "network-start-address": "2606:ae00:2e10:40::0", + "cidr-mask": "64", + "ip-version": "6", + "orchestration-status": "Created", + "dhcp-enabled": false, + "dhcp-start": "", + "dhcp-end": "", + "ip-assignment-direction": "false", + "resource-version": "1516046029791" + }, + "extra-properties": {} + }, + { + "subnet": { + "subnet-id": "c8e757c5-416d-4fa4-83d1-c099be0e8cdb", + "subnet-name": "S2_rk_cor_direct", + "neutron-subnet-id": "2ad97d5c-df2f-4ea9-8310-ea8911b12422", + "gateway-address": "2606:ae00:2e10::1", + "network-start-address": "2606:ae00:2e10::0", + "cidr-mask": "64", + "ip-version": "6", + "orchestration-status": "Created", + "dhcp-enabled": false, + "dhcp-start": "", + "dhcp-end": "", + "ip-assignment-direction": "false", + "resource-version": "1516046029906" + }, + "extra-properties": {} + }, + { + "subnet": { + "subnet-id": "ff098d42-deb3-432e-a6a8-04b37d4569aa", + "subnet-name": "S7_rk_cor_direct", + "neutron-subnet-id": "91450e6f-2634-4746-88ba-a234312365d1", + "gateway-address": "10.0.0.10", + "network-start-address": "10.0.0.10", + "cidr-mask": "25", + "ip-version": "4", + "orchestration-status": "Created", + "dhcp-enabled": true, + "dhcp-start": "10.0.0.10", + "dhcp-end": "10.0.0.10", + "ip-assignment-direction": "true", + "resource-version": "1516046029889" + }, + "extra-properties": {} + }, + { + "subnet": { + "subnet-id": "3069ca48-c228-485d-bee4-845ab65cd347", + "subnet-name": "S5_rk_cor_direct", + "neutron-subnet-id": "43731fee-e891-4cc8-8476-f995f890f8d0", + "gateway-address": "10.0.0.10", + "network-start-address": "10.0.0.10", + "cidr-mask": "28", + "ip-version": "4", + "orchestration-status": "Created", + "dhcp-enabled": false, + "dhcp-start": "", + "dhcp-end": "", + "ip-assignment-direction": "false", + "resource-version": "1516046029774" + }, + "extra-properties": {} + }, + { + "subnet": { + "subnet-id": "ba4a94e7-14c6-45b1-adc8-ec6c4e6d73eb", + "subnet-name": "S6_rk_cor_direct", + "neutron-subnet-id": "b55ff2b2-1d2f-41af-b872-1bcca2e1061b", + "gateway-address": "10.0.0.10", + "network-start-address": "10.0.0.10", + "cidr-mask": "28", + "ip-version": "4", + "orchestration-status": "Created", + "dhcp-enabled": false, + "dhcp-start": "", + "dhcp-end": "", + "ip-assignment-direction": "false", + "resource-version": "1516046029922" + }, + "extra-properties": {} + }, + { + "subnet": { + "subnet-id": "8ab38c73-de01-483e-a86c-c2e566d4cde1", + "subnet-name": "S3_rk_cor_direct", + "neutron-subnet-id": "9ec533a7-998f-4c99-a70b-d4601d2a377f", + "gateway-address": "10.0.0.10", + "network-start-address": "10.0.0.10", + "cidr-mask": "25", + "ip-version": "4", + "orchestration-status": "Created", + "dhcp-enabled": false, + "dhcp-start": "", + "dhcp-end": "", + "ip-assignment-direction": "false", + "resource-version": "1516046029799" + }, + "extra-properties": {} + }, + { + "subnet": { + "subnet-id": "3659ce61-3c12-4e4c-b453-d97076e74dbb", + "subnet-name": "S12_rk_cor_direct", + "neutron-subnet-id": "1b204870-f5a4-474a-a779-5fc3c0e103db", + "gateway-address": "2606:ae00:2e10:44::1", + "network-start-address": "2606:ae00:2e10:44::0", + "cidr-mask": "64", + "ip-version": "6", + "orchestration-status": "Created", + "dhcp-enabled": true, + "dhcp-start": "2606:ae00:2e10:44::3", + "dhcp-end": "2606:ae00:2e10:44::7f", + "ip-assignment-direction": "true", + "resource-version": "1516046029873" + }, + "extra-properties": {} + }, + { + "subnet": { + "subnet-id": "0275b352-91d3-48ae-b6d4-fdb8fc00aaee", + "subnet-name": "S1_rk_cor_direct", + "neutron-subnet-id": "81d83779-14fb-4c90-8ecc-8bdcb83e3033", + "gateway-address": "10.0.0.10", + "network-start-address": "10.0.0.10", + "cidr-mask": "24", + "ip-version": "4", + "orchestration-status": "Created", + "dhcp-enabled": true, + "dhcp-start": "10.0.0.10", + "dhcp-end": "10.0.0.10", + "ip-assignment-direction": "true", + "resource-version": "1516046029856" + }, + "extra-properties": {} + }, + { + "subnet": { + "subnet-id": "2607039d-eef4-47cd-9403-a8e5dcfeae02", + "subnet-name": "S11_rk_cor_direct", + "neutron-subnet-id": "5d7f2857-1308-4eda-861c-fc86293dfe1f", + "gateway-address": "2606:ae00:2e10:43::1", + "network-start-address": "2606:ae00:2e10:43::0", + "cidr-mask": "64", + "ip-version": "6", + "orchestration-status": "Created", + "dhcp-enabled": false, + "dhcp-start": "", + "dhcp-end": "", + "ip-assignment-direction": "false", + "resource-version": "1516046029839" + }, + "extra-properties": {} + }, + { + "subnet": { + "subnet-id": "18757c6a-015d-403b-990f-4d41511aec4b", + "subnet-name": "S9_rk_cor_direct", + "neutron-subnet-id": "97d83e23-db35-46cf-93f8-8bbb7ff0b279", + "gateway-address": "2606:ae00:2e10:41::1", + "network-start-address": "2606:ae00:2e10:41::0", + "cidr-mask": "64", + "ip-version": "6", + "orchestration-status": "Created", + "dhcp-enabled": false, + "dhcp-start": "", + "dhcp-end": "", + "ip-assignment-direction": "false", + "resource-version": "1516046029831" + }, + "extra-properties": {} + }, + { + "subnet": { + "subnet-id": "3fc931a8-b3f8-45ce-b75e-0ce6df2bbf7d", + "subnet-name": "S10_rk_cor_direct", + "neutron-subnet-id": "aec8e0eb-eb0f-459b-be1f-2bd6d44d7c6d", + "gateway-address": "2606:ae00:2e10:42::1", + "network-start-address": "2606:ae00:2e10:42::0", + "cidr-mask": "64", + "ip-version": "6", + "orchestration-status": "Created", + "dhcp-enabled": false, + "dhcp-start": "", + "dhcp-end": "", + "ip-assignment-direction": "false", + "resource-version": "1516046029848" + }, + "extra-properties": {} + } + ] + } + } + ] + } + } + ] +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithNetwork/serviceWithNetwork.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithNetwork/serviceWithNetwork.json new file mode 100644 index 000000000..35539dde4 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithNetwork/serviceWithNetwork.json @@ -0,0 +1,47 @@ +{ + "service": { + "uuid": "5a3ad576-c01d-4bed-8194-0e72b4a3d020", + "invariantUuid": "92a72881-0a97-4d16-8c29-4831062e7e9b", + "name": "Network_repl_vMOG", + "version": "1.0", + "toscaModelURL": null, + "category": "Emanuel", + "serviceType": "", + "serviceRole": "", + "description": "tbd", + "serviceEcompNaming": "true", + "instantiationType": "ClientConfig", + "inputs": {} + }, + "vnfs": {}, + "networks": { + "CONTRAIL30_BASIC 0": { + "uuid": "2920cd06-f585-436b-a002-c3081f6a91b3", + "invariantUuid": "56f4e746-c58e-4b76-93d4-6717b8f59205", + "description": "Basic contrail 3.0.x L3 network for AIC 3.x sites. Keeping for existing mobility networks. ", + "name": "CONTRAIL30_BASIC", + "version": "3.0", + "customizationUuid": "8e2128bf-77e8-4a48-84d0-520c44718161", + "inputs": {}, + "commands": {}, + "properties": { + "network_role": "NetworkReplVmog.repl", + "network_assignments": "{is_external_network=false, ipv4_subnet_default_assignment={min_subnets_count=1}, ecomp_generated_network_assignment=false, ipv6_subnet_default_assignment={min_subnets_count=1}}", + "exVL_naming": "{ecomp_generated_naming=true}", + "network_flows": "{is_network_policy=false, is_bound_to_vpn=false}", + "network_scope": "Service", + "network_type": "CONTRAIL30_BASIC", + "network_homing": "{ecomp_selected_instance_node_target=false}" + }, + "type": "VL", + "modelCustomizationName": "CONTRAIL30_BASIC 0" + } + }, + "collectionResource": {}, + "configurations": {}, + "fabricConfigurations": {}, + "serviceProxies": {}, + "vfModules": {}, + "volumeGroups": {}, + "pnfs": {} +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json index a95803f7d..c9f158027 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/serviceWithVnfAndVfModules.json @@ -4,17 +4,17 @@ }, "service": { "serviceHierarchy": { - "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd": { + "f4d84bb4-a416-4b4e-997e-0059973630b9": { "service": { - "uuid": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", - "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", - "name": "action-data", + "uuid": "f4d84bb4-a416-4b4e-997e-0059973630b9", + "invariantUuid": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9", + "name": "ADIOD vMX vPE_BV Service 488", "version": "1.0", "toscaModelURL": null, - "category": "", + "category": "Network L1-3", "serviceType": "", "serviceRole": "", - "description": "", + "description": "ADIOD vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM", "serviceEcompNaming": "true", "instantiationType": "Macro", "inputs": { @@ -30,213 +30,13 @@ } }, "vnfs": { - "2017-388_ADIOD-vPE 1": { - "uuid": "0903e1c0-8e03-4936-b5c2-260653b96413", - "invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d", - "description": "Name ADIOD vPE Description The provider edge function for the ADIOD service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM", - "name": "2017-388_ADIOD-vPE", - "version": "1.0", - "customizationUuid": "280dec31-f16d-488b-9668-4aae55d6648a", - "inputs": {}, - "commands": {}, - "properties": { - "vmxvre_retype": "RE-VMX", - "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version", - "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d", - "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9", - "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF", - "int_ctl_net_name": "VMX-INTXI", - "vmx_int_ctl_prefix": "128.0.0.0", - "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5", - "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279", - "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a", - "nf_type": "vPE", - "vmxvpfe_int_ctl_ip_1": "128.0.0.16", - "is_AVPN_service": "false", - "vmx_RSG_name": "vREXI-affinity", - "vmx_int_ctl_forwarding": "l2", - "vmxvre_oam_ip_0": "10.40.123.5", - "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF", - "vmxvpfe_sriov41_0_port_vlanstrip": "false", - "vmxvpfe_sriov42_0_port_vlanfilter": "4001", - "vmxvpfe_sriov44_0_port_unknownunicastallow": "true", - "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2", - "vmxvre_instance": "0", - "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF", - "vmxvre_flavor_name": "ns.c1r16d32.v5", - "vmxvpfe_volume_size_0": "40.0", - "vmxvpfe_sriov43_0_port_vlanfilter": "4001", - "nf_naming": "{ecomp_generated_naming=true}", - "nf_naming_code": "Navneet", - "vmxvre_name_0": "vREXI", - "vmxvpfe_sriov42_0_port_vlanstrip": "false", - "vmxvpfe_volume_name_0": "vPFEXI_FBVolume", - "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141", - "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2", - "vmxvpfe_sriov43_0_port_unknownunicastallow": "true", - "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true", - "vmxvre_console": "vidconsole", - "vmxvpfe_sriov44_0_port_vlanfilter": "4001", - "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF", - "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3", - "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true", - "vmxvpfe_sriov44_0_port_vlanstrip": "false", - "vf_module_id": "123", - "nf_function": "JAI", - "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true", - "vmxvre_int_ctl_ip_0": "128.0.0.1", - "ecomp_generated_naming": "true", - "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI", - "vnf_name": "mtnj309me6vre", - "vmxvpfe_sriov41_0_port_unknownunicastallow": "true", - "vmxvre_volume_type_1": "HITACHI", - "vmxvpfe_sriov44_0_port_broadcastallow": "true", - "vmxvre_volume_type_0": "HITACHI", - "vmxvpfe_volume_type_0": "HITACHI", - "vmxvpfe_sriov43_0_port_broadcastallow": "true", - "bandwidth_units": "get_input:adiodvpe0_bandwidth_units", - "vnf_id": "123", - "vmxvre_oam_prefix": "24", - "availability_zone_0": "mtpocfo-kvm-az01", - "ASN": "get_input:2017488_adiodvpe0_ASN", - "vmxvre_chassis_i2cid": "161", - "vmxvpfe_name_0": "vPFEXI", - "bandwidth": "get_input:adiodvpe0_bandwidth", - "availability_zone_max_count": "1", - "vmxvre_volume_size_0": "45.0", - "vmxvre_volume_size_1": "50.0", - "vmxvpfe_sriov42_0_port_broadcastallow": "true", - "vmxvre_oam_gateway": "10.40.123.1", - "vmxvre_volume_name_1": "vREXI_FAVolume", - "vmxvre_ore_present": "0", - "vmxvre_volume_name_0": "vREXI_FBVolume", - "vmxvre_type": "0", - "vnf_instance_name": "get_input:2017488_adiodvpe0_vnf_instance_name", - "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true", - "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429", - "vmx_int_ctl_len": "24", - "vmxvpfe_sriov43_0_port_vlanstrip": "false", - "vmxvpfe_sriov41_0_port_broadcastallow": "true", - "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d", - "vmxvpfe_sriov41_0_port_vlanfilter": "4001", - "nf_role": "Testing", - "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a", - "vmxvpfe_sriov42_0_port_unknownunicastallow": "true", - "vmxvpfe_flavor_name": "ns.c20r16d25.v5" - }, - "type": "VF", - "modelCustomizationName": "2017-388_ADIOD-vPE 1", - "vfModules": {}, - "volumeGroups": {}, - "vfcInstanceGroups": {} - }, - "2017-388_ADIOD-vPE 0": { - "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168", - "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", - "description": "Name ADIOD vPE Description The provider edge function for the ADIOD service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM", - "name": "2017-388_ADIOD-vPE", - "version": "4.0", - "customizationUuid": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c", - "inputs": {}, - "commands": {}, - "properties": { - "vmxvre_retype": "RE-VMX", - "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version", - "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d", - "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9", - "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF", - "int_ctl_net_name": "VMX-INTXI", - "vmx_int_ctl_prefix": "128.0.0.0", - "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5", - "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279", - "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a", - "nf_type": "vPE", - "vmxvpfe_int_ctl_ip_1": "128.0.0.16", - "is_AVPN_service": "false", - "vmx_RSG_name": "vREXI-affinity", - "vmx_int_ctl_forwarding": "l2", - "vmxvre_oam_ip_0": "10.40.123.5", - "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF", - "vmxvpfe_sriov41_0_port_vlanstrip": "false", - "vmxvpfe_sriov42_0_port_vlanfilter": "4001", - "vmxvpfe_sriov44_0_port_unknownunicastallow": "true", - "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2", - "vmxvre_instance": "0", - "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF", - "vmxvre_flavor_name": "ns.c1r16d32.v5", - "vmxvpfe_volume_size_0": "40.0", - "vmxvpfe_sriov43_0_port_vlanfilter": "4001", - "nf_naming": "{ecomp_generated_naming=true}", - "nf_naming_code": "Navneet", - "vmxvre_name_0": "vREXI", - "vmxvpfe_sriov42_0_port_vlanstrip": "false", - "vmxvpfe_volume_name_0": "vPFEXI_FBVolume", - "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141", - "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2", - "vmxvpfe_sriov43_0_port_unknownunicastallow": "true", - "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true", - "vmxvre_console": "vidconsole", - "vmxvpfe_sriov44_0_port_vlanfilter": "4001", - "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF", - "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3", - "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true", - "vmxvpfe_sriov44_0_port_vlanstrip": "false", - "vf_module_id": "123", - "nf_function": "JAI", - "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true", - "vmxvre_int_ctl_ip_0": "128.0.0.1", - "ecomp_generated_naming": "true", - "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI", - "vnf_name": "mtnj309me6vre", - "vmxvpfe_sriov41_0_port_unknownunicastallow": "true", - "vmxvre_volume_type_1": "HITACHI", - "vmxvpfe_sriov44_0_port_broadcastallow": "true", - "vmxvre_volume_type_0": "HITACHI", - "vmxvpfe_volume_type_0": "HITACHI", - "vmxvpfe_sriov43_0_port_broadcastallow": "true", - "bandwidth_units": "get_input:adiodvpe0_bandwidth_units", - "vnf_id": "123", - "vmxvre_oam_prefix": "24", - "availability_zone_0": "mtpocfo-kvm-az01", - "ASN": "get_input:2017488_adiodvpe0_ASN", - "vmxvre_chassis_i2cid": "161", - "vmxvpfe_name_0": "vPFEXI", - "bandwidth": "get_input:adiodvpe0_bandwidth", - "availability_zone_max_count": "1", - "vmxvre_volume_size_0": "45.0", - "vmxvre_volume_size_1": "50.0", - "vmxvpfe_sriov42_0_port_broadcastallow": "true", - "vmxvre_oam_gateway": "10.40.123.1", - "vmxvre_volume_name_1": "vREXI_FAVolume", - "vmxvre_ore_present": "0", - "vmxvre_volume_name_0": "vREXI_FBVolume", - "vmxvre_type": "0", - "vnf_instance_name": "get_input:2017488_adiodvpe0_vnf_instance_name", - "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true", - "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429", - "vmx_int_ctl_len": "24", - "vmxvpfe_sriov43_0_port_vlanstrip": "false", - "vmxvpfe_sriov41_0_port_broadcastallow": "true", - "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d", - "vmxvpfe_sriov41_0_port_vlanfilter": "4001", - "nf_role": "Testing", - "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a", - "vmxvpfe_sriov42_0_port_unknownunicastallow": "true", - "vmxvpfe_flavor_name": "ns.c20r16d25.v5" - }, - "type": "VF", - "modelCustomizationName": "2017-388_ADIOD-vPE 0", - "vfModules": {}, - "volumeGroups": {}, - "vfcInstanceGroups": {} - }, "2017-488_ADIOD-vPE 0": { - "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", - "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "uuid": "ea81d6f7-0861-44a7-b7d5-d173b562c350", + "invariantUuid": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e", "description": "Name ADIOD vPE Description The provider edge function for the ADIOD service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM", "name": "2017-488_ADIOD-vPE", - "version": "5.0", - "customizationUuid": "1da7b585-5e61-4993-b95e-8e6606c81e45", + "version": "9.0", + "customizationUuid": "41516cc6-5098-4b40-a619-f8d5f55fc4d8", "inputs": {}, "commands": {}, "properties": { @@ -246,33 +46,34 @@ "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9", "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF", "int_ctl_net_name": "VMX-INTXI", - "vmx_int_ctl_prefix": "128.0.0.0", + "vmx_int_ctl_prefix": "10.0.0.10", "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5", "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279", "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a", - "nf_type": "vPE", - "vmxvpfe_int_ctl_ip_1": "128.0.0.16", + "nf_type": "ROUTER", + "vmxvpfe_int_ctl_ip_1": "10.0.0.10", "is_AVPN_service": "false", "vmx_RSG_name": "vREXI-affinity", "vmx_int_ctl_forwarding": "l2", - "vmxvre_oam_ip_0": "10.40.123.5", + "vmxvre_oam_ip_0": "10.0.0.10", "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF", "vmxvpfe_sriov41_0_port_vlanstrip": "false", "vmxvpfe_sriov42_0_port_vlanfilter": "4001", "vmxvpfe_sriov44_0_port_unknownunicastallow": "true", - "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2", + "vmxvre_image_name_0": "vre172_nova_img", "vmxvre_instance": "0", "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF", "vmxvre_flavor_name": "ns.c1r16d32.v5", "vmxvpfe_volume_size_0": "40.0", "vmxvpfe_sriov43_0_port_vlanfilter": "4001", "nf_naming": "{ecomp_generated_naming=true}", - "nf_naming_code": "Navneet", + "multi_stage_design": "false", + "nf_naming_code": "me6", "vmxvre_name_0": "vREXI", "vmxvpfe_sriov42_0_port_vlanstrip": "false", "vmxvpfe_volume_name_0": "vPFEXI_FBVolume", "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141", - "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2", + "vmxvpfe_image_name_0": "vpfe172_nova_img", "vmxvpfe_sriov43_0_port_unknownunicastallow": "true", "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true", "vmxvre_console": "vidconsole", @@ -282,9 +83,9 @@ "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true", "vmxvpfe_sriov44_0_port_vlanstrip": "false", "vf_module_id": "123", - "nf_function": "JAI", + "nf_function": "ADIOD vPE", "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true", - "vmxvre_int_ctl_ip_0": "128.0.0.1", + "vmxvre_int_ctl_ip_0": "10.0.0.10", "ecomp_generated_naming": "true", "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI", "vnf_name": "mtnj309me6vre", @@ -294,19 +95,19 @@ "vmxvre_volume_type_0": "HITACHI", "vmxvpfe_volume_type_0": "HITACHI", "vmxvpfe_sriov43_0_port_broadcastallow": "true", - "bandwidth_units": "get_input:adiodvpe0_bandwidth_units", + "bandwidth_units": "get_input:2017488_adiodvpe0_bandwidth_units", "vnf_id": "123", "vmxvre_oam_prefix": "24", - "availability_zone_0": "mtpocfo-kvm-az01", + "availability_zone_0": "get_input:2017488_adiodvpe0_availability_zone_0", "ASN": "get_input:2017488_adiodvpe0_ASN", "vmxvre_chassis_i2cid": "161", "vmxvpfe_name_0": "vPFEXI", - "bandwidth": "get_input:adiodvpe0_bandwidth", + "bandwidth": "get_input:2017488_adiodvpe0_bandwidth", "availability_zone_max_count": "1", "vmxvre_volume_size_0": "45.0", "vmxvre_volume_size_1": "50.0", "vmxvpfe_sriov42_0_port_broadcastallow": "true", - "vmxvre_oam_gateway": "10.40.123.1", + "vmxvre_oam_gateway": "10.0.0.10", "vmxvre_volume_name_1": "vREXI_FAVolume", "vmxvre_ore_present": "0", "vmxvre_volume_name_0": "vREXI_FBVolume", @@ -319,7 +120,7 @@ "vmxvpfe_sriov41_0_port_broadcastallow": "true", "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d", "vmxvpfe_sriov41_0_port_vlanfilter": "4001", - "nf_role": "Testing", + "nf_role": "vPE", "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a", "vmxvpfe_sriov42_0_port_unknownunicastallow": "true", "vmxvpfe_flavor_name": "ns.c20r16d25.v5" @@ -328,12 +129,12 @@ "modelCustomizationName": "2017-488_ADIOD-vPE 0", "vfModules": { "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": { - "uuid": "25284168-24bb-4698-8cb4-3f509146eca5", + "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df", "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", - "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3", "description": null, "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", - "version": "6", + "version": "8", "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", "properties": { "minCountInstances": 0, @@ -342,7 +143,20 @@ "vfModuleLabel": "ADIOD_vRE_BV" }, "inputs": { - "adiodvpe0_bandwidth": { + "2017488_adiodvpe0_bandwidth_units": { + "type": "string", + "description": "Units of bandwidth", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "bandwidth_units" + }, + "constraints": null, + "required": true, + "default": "Gbps" + }, + "2017488_adiodvpe0_bandwidth": { "type": "string", "description": "Requested VPE bandwidth", "entry_schema": null, @@ -393,30 +207,17 @@ "constraints": null, "required": true, "default": "ATLMY8GA" - }, - "adiodvpe0_bandwidth_units": { - "type": "string", - "description": "Units of bandwidth", - "entry_schema": null, - "inputProperties": { - "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", - "paramName": "bandwidth_units" - }, - "constraints": null, - "required": true, - "default": "Gbps" } }, "volumeGroupAllowed": true }, "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": { - "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "uuid": "040e591e-5d30-4e0d-850f-7266e5a8e013", "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091", - "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", + "customizationUuid": "5c5f91f9-5e31-4120-b892-5536587ec258", "description": null, "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0", - "version": "5", + "version": "6", "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0", "properties": { "minCountInstances": 1, @@ -428,12 +229,12 @@ "volumeGroupAllowed": false }, "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": { - "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a", + "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe", "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339", - "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557", + "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452", "description": null, "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", - "version": "6", + "version": "8", "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", "properties": { "minCountInstances": 0, @@ -441,18 +242,32 @@ "initialCount": 0, "vfModuleLabel": "ADIOD_vPFE_BV" }, - "inputs": {}, + "inputs": { + "2017488_adiodvpe0_availability_zone_0": { + "type": "string", + "description": "The Availability Zone to launch the instance.", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vPFE_BV", + "paramName": "availability_zone_0" + }, + "constraints": null, + "required": true, + "default": "mtpocfo-kvm-az01" + } + }, "volumeGroupAllowed": true } }, "volumeGroups": { "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": { - "uuid": "25284168-24bb-4698-8cb4-3f509146eca5", + "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df", "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", - "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3", "description": null, "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", - "version": "6", + "version": "8", "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", "properties": { "minCountInstances": 0, @@ -461,7 +276,20 @@ "vfModuleLabel": "ADIOD_vRE_BV" }, "inputs": { - "adiodvpe0_bandwidth": { + "2017488_adiodvpe0_bandwidth_units": { + "type": "string", + "description": "Units of bandwidth", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "bandwidth_units" + }, + "constraints": null, + "required": true, + "default": "Gbps" + }, + "2017488_adiodvpe0_bandwidth": { "type": "string", "description": "Requested VPE bandwidth", "entry_schema": null, @@ -512,29 +340,16 @@ "constraints": null, "required": true, "default": "ATLMY8GA" - }, - "adiodvpe0_bandwidth_units": { - "type": "string", - "description": "Units of bandwidth", - "entry_schema": null, - "inputProperties": { - "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", - "paramName": "bandwidth_units" - }, - "constraints": null, - "required": true, - "default": "Gbps" } } }, "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": { - "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a", + "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe", "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339", - "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557", + "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452", "description": null, "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", - "version": "6", + "version": "8", "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", "properties": { "minCountInstances": 0, @@ -542,7 +357,21 @@ "initialCount": 0, "vfModuleLabel": "ADIOD_vPFE_BV" }, - "inputs": {} + "inputs": { + "2017488_adiodvpe0_availability_zone_0": { + "type": "string", + "description": "The Availability Zone to launch the instance.", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vPFE_BV", + "paramName": "availability_zone_0" + }, + "constraints": null, + "required": true, + "default": "mtpocfo-kvm-az01" + } + } } }, "vfcInstanceGroups": {} @@ -554,12 +383,12 @@ "serviceProxies": {}, "vfModules": { "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": { - "uuid": "25284168-24bb-4698-8cb4-3f509146eca5", + "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df", "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", - "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3", "description": null, "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", - "version": "6", + "version": "8", "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", "properties": { "minCountInstances": 0, @@ -568,7 +397,20 @@ "vfModuleLabel": "ADIOD_vRE_BV" }, "inputs": { - "adiodvpe0_bandwidth": { + "2017488_adiodvpe0_bandwidth_units": { + "type": "string", + "description": "Units of bandwidth", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "bandwidth_units" + }, + "constraints": null, + "required": true, + "default": "Gbps" + }, + "2017488_adiodvpe0_bandwidth": { "type": "string", "description": "Requested VPE bandwidth", "entry_schema": null, @@ -619,30 +461,17 @@ "constraints": null, "required": true, "default": "ATLMY8GA" - }, - "adiodvpe0_bandwidth_units": { - "type": "string", - "description": "Units of bandwidth", - "entry_schema": null, - "inputProperties": { - "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", - "paramName": "bandwidth_units" - }, - "constraints": null, - "required": true, - "default": "Gbps" } }, "volumeGroupAllowed": true }, "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": { - "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db", + "uuid": "040e591e-5d30-4e0d-850f-7266e5a8e013", "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091", - "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", + "customizationUuid": "5c5f91f9-5e31-4120-b892-5536587ec258", "description": null, "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0", - "version": "5", + "version": "6", "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0", "properties": { "minCountInstances": 1, @@ -654,12 +483,12 @@ "volumeGroupAllowed": false }, "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": { - "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a", + "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe", "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339", - "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557", + "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452", "description": null, "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", - "version": "6", + "version": "8", "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", "properties": { "minCountInstances": 0, @@ -667,18 +496,32 @@ "initialCount": 0, "vfModuleLabel": "ADIOD_vPFE_BV" }, - "inputs": {}, + "inputs": { + "2017488_adiodvpe0_availability_zone_0": { + "type": "string", + "description": "The Availability Zone to launch the instance.", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vPFE_BV", + "paramName": "availability_zone_0" + }, + "constraints": null, + "required": true, + "default": "mtpocfo-kvm-az01" + } + }, "volumeGroupAllowed": true } }, "volumeGroups": { "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": { - "uuid": "25284168-24bb-4698-8cb4-3f509146eca5", + "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df", "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", - "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", + "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3", "description": null, "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", - "version": "6", + "version": "8", "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", "properties": { "minCountInstances": 0, @@ -687,7 +530,20 @@ "vfModuleLabel": "ADIOD_vRE_BV" }, "inputs": { - "adiodvpe0_bandwidth": { + "2017488_adiodvpe0_bandwidth_units": { + "type": "string", + "description": "Units of bandwidth", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "bandwidth_units" + }, + "constraints": null, + "required": true, + "default": "Gbps" + }, + "2017488_adiodvpe0_bandwidth": { "type": "string", "description": "Requested VPE bandwidth", "entry_schema": null, @@ -738,29 +594,16 @@ "constraints": null, "required": true, "default": "ATLMY8GA" - }, - "adiodvpe0_bandwidth_units": { - "type": "string", - "description": "Units of bandwidth", - "entry_schema": null, - "inputProperties": { - "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", - "paramName": "bandwidth_units" - }, - "constraints": null, - "required": true, - "default": "Gbps" } } }, "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": { - "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a", + "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe", "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339", - "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557", + "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452", "description": null, "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", - "version": "6", + "version": "8", "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", "properties": { "minCountInstances": 0, @@ -768,22 +611,36 @@ "initialCount": 0, "vfModuleLabel": "ADIOD_vPFE_BV" }, - "inputs": {} + "inputs": { + "2017488_adiodvpe0_availability_zone_0": { + "type": "string", + "description": "The Availability Zone to launch the instance.", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vPFE_BV", + "paramName": "availability_zone_0" + }, + "constraints": null, + "required": true, + "default": "mtpocfo-kvm-az01" + } + } } }, "pnfs": {} }, - "f4d84bb4-a416-4b4e-997e-0059973630b9": { + "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd": { "service": { - "uuid": "f4d84bb4-a416-4b4e-997e-0059973630b9", - "invariantUuid": "598e3f9e-3244-4d8f-a8e0-0e5d7a29eda9", - "name": "ADIOD vMX vPE_BV Service 488", + "uuid": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", + "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "name": "action-data", "version": "1.0", "toscaModelURL": null, - "category": "Network L1-3", + "category": "", "serviceType": "", "serviceRole": "", - "description": "ADIOD vMX vPE based on Juniper 17.2 release. Updated with updated VF for v8.0 of VLM", + "description": "", "serviceEcompNaming": "true", "instantiationType": "Macro", "inputs": { @@ -799,13 +656,213 @@ } }, "vnfs": { + "2017-388_ADIOD-vPE 1": { + "uuid": "0903e1c0-8e03-4936-b5c2-260653b96413", + "invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d", + "description": "Name ADIOD vPE Description The provider edge function for the ADIOD service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM", + "name": "2017-388_ADIOD-vPE", + "version": "1.0", + "customizationUuid": "280dec31-f16d-488b-9668-4aae55d6648a", + "inputs": {}, + "commands": {}, + "properties": { + "vmxvre_retype": "RE-VMX", + "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version", + "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d", + "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9", + "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF", + "int_ctl_net_name": "VMX-INTXI", + "vmx_int_ctl_prefix": "10.0.0.10", + "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5", + "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279", + "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a", + "nf_type": "vPE", + "vmxvpfe_int_ctl_ip_1": "10.0.0.10", + "is_AVPN_service": "false", + "vmx_RSG_name": "vREXI-affinity", + "vmx_int_ctl_forwarding": "l2", + "vmxvre_oam_ip_0": "10.0.0.10", + "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF", + "vmxvpfe_sriov41_0_port_vlanstrip": "false", + "vmxvpfe_sriov42_0_port_vlanfilter": "4001", + "vmxvpfe_sriov44_0_port_unknownunicastallow": "true", + "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2", + "vmxvre_instance": "0", + "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF", + "vmxvre_flavor_name": "ns.c1r16d32.v5", + "vmxvpfe_volume_size_0": "40.0", + "vmxvpfe_sriov43_0_port_vlanfilter": "4001", + "nf_naming": "{ecomp_generated_naming=true}", + "nf_naming_code": "Navneet", + "vmxvre_name_0": "vREXI", + "vmxvpfe_sriov42_0_port_vlanstrip": "false", + "vmxvpfe_volume_name_0": "vPFEXI_FBVolume", + "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141", + "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2", + "vmxvpfe_sriov43_0_port_unknownunicastallow": "true", + "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true", + "vmxvre_console": "vidconsole", + "vmxvpfe_sriov44_0_port_vlanfilter": "4001", + "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF", + "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3", + "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true", + "vmxvpfe_sriov44_0_port_vlanstrip": "false", + "vf_module_id": "123", + "nf_function": "JAI", + "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true", + "vmxvre_int_ctl_ip_0": "10.0.0.10", + "ecomp_generated_naming": "true", + "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI", + "vnf_name": "mtnj309me6vre", + "vmxvpfe_sriov41_0_port_unknownunicastallow": "true", + "vmxvre_volume_type_1": "HITACHI", + "vmxvpfe_sriov44_0_port_broadcastallow": "true", + "vmxvre_volume_type_0": "HITACHI", + "vmxvpfe_volume_type_0": "HITACHI", + "vmxvpfe_sriov43_0_port_broadcastallow": "true", + "bandwidth_units": "get_input:adiodvpe0_bandwidth_units", + "vnf_id": "123", + "vmxvre_oam_prefix": "24", + "availability_zone_0": "mtpocfo-kvm-az01", + "ASN": "get_input:2017488_adiodvpe0_ASN", + "vmxvre_chassis_i2cid": "161", + "vmxvpfe_name_0": "vPFEXI", + "bandwidth": "get_input:adiodvpe0_bandwidth", + "availability_zone_max_count": "1", + "vmxvre_volume_size_0": "45.0", + "vmxvre_volume_size_1": "50.0", + "vmxvpfe_sriov42_0_port_broadcastallow": "true", + "vmxvre_oam_gateway": "10.0.0.10", + "vmxvre_volume_name_1": "vREXI_FAVolume", + "vmxvre_ore_present": "0", + "vmxvre_volume_name_0": "vREXI_FBVolume", + "vmxvre_type": "0", + "vnf_instance_name": "get_input:2017488_adiodvpe0_vnf_instance_name", + "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true", + "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429", + "vmx_int_ctl_len": "24", + "vmxvpfe_sriov43_0_port_vlanstrip": "false", + "vmxvpfe_sriov41_0_port_broadcastallow": "true", + "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d", + "vmxvpfe_sriov41_0_port_vlanfilter": "4001", + "nf_role": "Testing", + "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a", + "vmxvpfe_sriov42_0_port_unknownunicastallow": "true", + "vmxvpfe_flavor_name": "ns.c20r16d25.v5" + }, + "type": "VF", + "modelCustomizationName": "2017-388_ADIOD-vPE 1", + "vfModules": {}, + "volumeGroups": {}, + "vfcInstanceGroups": {} + }, + "2017-388_ADIOD-vPE 0": { + "uuid": "afacccf6-397d-45d6-b5ae-94c39734b168", + "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", + "description": "Name ADIOD vPE Description The provider edge function for the ADIOD service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM", + "name": "2017-388_ADIOD-vPE", + "version": "4.0", + "customizationUuid": "b3c76f73-eeb5-4fb6-9d31-72a889f1811c", + "inputs": {}, + "commands": {}, + "properties": { + "vmxvre_retype": "RE-VMX", + "vnf_config_template_version": "get_input:2017488_adiodvpe0_vnf_config_template_version", + "sriov44_net_id": "48d399b3-11ee-48a8-94d2-f0ea94d6be8d", + "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9", + "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF", + "int_ctl_net_name": "VMX-INTXI", + "vmx_int_ctl_prefix": "10.0.0.10", + "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5", + "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279", + "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a", + "nf_type": "vPE", + "vmxvpfe_int_ctl_ip_1": "10.0.0.10", + "is_AVPN_service": "false", + "vmx_RSG_name": "vREXI-affinity", + "vmx_int_ctl_forwarding": "l2", + "vmxvre_oam_ip_0": "10.0.0.10", + "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF", + "vmxvpfe_sriov41_0_port_vlanstrip": "false", + "vmxvpfe_sriov42_0_port_vlanfilter": "4001", + "vmxvpfe_sriov44_0_port_unknownunicastallow": "true", + "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2", + "vmxvre_instance": "0", + "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF", + "vmxvre_flavor_name": "ns.c1r16d32.v5", + "vmxvpfe_volume_size_0": "40.0", + "vmxvpfe_sriov43_0_port_vlanfilter": "4001", + "nf_naming": "{ecomp_generated_naming=true}", + "nf_naming_code": "Navneet", + "vmxvre_name_0": "vREXI", + "vmxvpfe_sriov42_0_port_vlanstrip": "false", + "vmxvpfe_volume_name_0": "vPFEXI_FBVolume", + "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141", + "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2", + "vmxvpfe_sriov43_0_port_unknownunicastallow": "true", + "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true", + "vmxvre_console": "vidconsole", + "vmxvpfe_sriov44_0_port_vlanfilter": "4001", + "vmxvpfe_sriov42_0_port_mac": "00:11:22:EF:AC:DF", + "vmxvpfe_volume_id_0": "47cede15-da2f-4397-a101-aa683220aff3", + "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true", + "vmxvpfe_sriov44_0_port_vlanstrip": "false", + "vf_module_id": "123", + "nf_function": "JAI", + "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true", + "vmxvre_int_ctl_ip_0": "10.0.0.10", + "ecomp_generated_naming": "true", + "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI", + "vnf_name": "mtnj309me6vre", + "vmxvpfe_sriov41_0_port_unknownunicastallow": "true", + "vmxvre_volume_type_1": "HITACHI", + "vmxvpfe_sriov44_0_port_broadcastallow": "true", + "vmxvre_volume_type_0": "HITACHI", + "vmxvpfe_volume_type_0": "HITACHI", + "vmxvpfe_sriov43_0_port_broadcastallow": "true", + "bandwidth_units": "get_input:adiodvpe0_bandwidth_units", + "vnf_id": "123", + "vmxvre_oam_prefix": "24", + "availability_zone_0": "mtpocfo-kvm-az01", + "ASN": "get_input:2017488_adiodvpe0_ASN", + "vmxvre_chassis_i2cid": "161", + "vmxvpfe_name_0": "vPFEXI", + "bandwidth": "get_input:adiodvpe0_bandwidth", + "availability_zone_max_count": "1", + "vmxvre_volume_size_0": "45.0", + "vmxvre_volume_size_1": "50.0", + "vmxvpfe_sriov42_0_port_broadcastallow": "true", + "vmxvre_oam_gateway": "10.0.0.10", + "vmxvre_volume_name_1": "vREXI_FAVolume", + "vmxvre_ore_present": "0", + "vmxvre_volume_name_0": "vREXI_FBVolume", + "vmxvre_type": "0", + "vnf_instance_name": "get_input:2017488_adiodvpe0_vnf_instance_name", + "vmxvpfe_sriov41_0_port_unknownmulticastallow": "true", + "oam_net_id": "b95eeb1d-d55d-4827-abb4-8ebb94941429", + "vmx_int_ctl_len": "24", + "vmxvpfe_sriov43_0_port_vlanstrip": "false", + "vmxvpfe_sriov41_0_port_broadcastallow": "true", + "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d", + "vmxvpfe_sriov41_0_port_vlanfilter": "4001", + "nf_role": "Testing", + "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a", + "vmxvpfe_sriov42_0_port_unknownunicastallow": "true", + "vmxvpfe_flavor_name": "ns.c20r16d25.v5" + }, + "type": "VF", + "modelCustomizationName": "2017-388_ADIOD-vPE 0", + "vfModules": {}, + "volumeGroups": {}, + "vfcInstanceGroups": {} + }, "2017-488_ADIOD-vPE 0": { - "uuid": "ea81d6f7-0861-44a7-b7d5-d173b562c350", - "invariantUuid": "5be7e99e-8eb2-4d97-be63-8081ff3cd10e", + "uuid": "69e09f68-8b63-4cc9-b9ff-860960b5db09", + "invariantUuid": "72e465fe-71b1-4e7b-b5ed-9496118ff7a8", "description": "Name ADIOD vPE Description The provider edge function for the ADIOD service supported by the Junipers VMX product Category Router Vendor Juniper Vendor Release Code 17.2 Owners Mary Fragale. Updated 9-25 to use v8.0 of the Juniper Valid 2 VLM", "name": "2017-488_ADIOD-vPE", - "version": "9.0", - "customizationUuid": "41516cc6-5098-4b40-a619-f8d5f55fc4d8", + "version": "5.0", + "customizationUuid": "1da7b585-5e61-4993-b95e-8e6606c81e45", "inputs": {}, "commands": {}, "properties": { @@ -815,34 +872,33 @@ "int_ctl_net_id": "2f323477-6936-4d01-ac53-d849430281d9", "vmxvpfe_sriov41_0_port_mac": "00:11:22:EF:AC:DF", "int_ctl_net_name": "VMX-INTXI", - "vmx_int_ctl_prefix": "128.0.0.0", + "vmx_int_ctl_prefix": "10.0.0.10", "sriov43_net_id": "da349ca1-6de9-4548-be88-2d88e99bfef5", "sriov42_net_id": "760669ba-013d-4d9b-b0e7-4151fe2e6279", "sriov41_net_id": "25ad52d5-c165-40f8-b3b0-ddfc2373280a", - "nf_type": "ROUTER", - "vmxvpfe_int_ctl_ip_1": "128.0.0.16", + "nf_type": "vPE", + "vmxvpfe_int_ctl_ip_1": "10.0.0.10", "is_AVPN_service": "false", "vmx_RSG_name": "vREXI-affinity", "vmx_int_ctl_forwarding": "l2", - "vmxvre_oam_ip_0": "10.40.123.5", + "vmxvre_oam_ip_0": "10.0.0.10", "vmxvpfe_sriov44_0_port_mac": "00:11:22:EF:AC:DF", "vmxvpfe_sriov41_0_port_vlanstrip": "false", "vmxvpfe_sriov42_0_port_vlanfilter": "4001", "vmxvpfe_sriov44_0_port_unknownunicastallow": "true", - "vmxvre_image_name_0": "vre172_nova_img", + "vmxvre_image_name_0": "VRE-ENGINE_17.2-S2.1.qcow2", "vmxvre_instance": "0", "vmxvpfe_sriov43_0_port_mac": "00:11:22:EF:AC:DF", "vmxvre_flavor_name": "ns.c1r16d32.v5", "vmxvpfe_volume_size_0": "40.0", "vmxvpfe_sriov43_0_port_vlanfilter": "4001", "nf_naming": "{ecomp_generated_naming=true}", - "multi_stage_design": "false", - "nf_naming_code": "me6", + "nf_naming_code": "Navneet", "vmxvre_name_0": "vREXI", "vmxvpfe_sriov42_0_port_vlanstrip": "false", "vmxvpfe_volume_name_0": "vPFEXI_FBVolume", "vmx_RSG_id": "bd89a33c-13c3-4a04-8fde-1a57eb123141", - "vmxvpfe_image_name_0": "vpfe172_nova_img", + "vmxvpfe_image_name_0": "VPE_ROUTING-ENGINE_17.2R1-S2.1.qcow2", "vmxvpfe_sriov43_0_port_unknownunicastallow": "true", "vmxvpfe_sriov44_0_port_unknownmulticastallow": "true", "vmxvre_console": "vidconsole", @@ -852,9 +908,9 @@ "vmxvpfe_sriov42_0_port_unknownmulticastallow": "true", "vmxvpfe_sriov44_0_port_vlanstrip": "false", "vf_module_id": "123", - "nf_function": "ADIOD vPE", + "nf_function": "JAI", "vmxvpfe_sriov43_0_port_unknownmulticastallow": "true", - "vmxvre_int_ctl_ip_0": "128.0.0.1", + "vmxvre_int_ctl_ip_0": "10.0.0.10", "ecomp_generated_naming": "true", "AIC_CLLI": "get_input:2017488_adiodvpe0_AIC_CLLI", "vnf_name": "mtnj309me6vre", @@ -864,19 +920,19 @@ "vmxvre_volume_type_0": "HITACHI", "vmxvpfe_volume_type_0": "HITACHI", "vmxvpfe_sriov43_0_port_broadcastallow": "true", - "bandwidth_units": "get_input:2017488_adiodvpe0_bandwidth_units", + "bandwidth_units": "get_input:adiodvpe0_bandwidth_units", "vnf_id": "123", "vmxvre_oam_prefix": "24", - "availability_zone_0": "get_input:2017488_adiodvpe0_availability_zone_0", + "availability_zone_0": "mtpocfo-kvm-az01", "ASN": "get_input:2017488_adiodvpe0_ASN", "vmxvre_chassis_i2cid": "161", "vmxvpfe_name_0": "vPFEXI", - "bandwidth": "get_input:2017488_adiodvpe0_bandwidth", + "bandwidth": "get_input:adiodvpe0_bandwidth", "availability_zone_max_count": "1", "vmxvre_volume_size_0": "45.0", "vmxvre_volume_size_1": "50.0", "vmxvpfe_sriov42_0_port_broadcastallow": "true", - "vmxvre_oam_gateway": "10.40.123.1", + "vmxvre_oam_gateway": "10.0.0.10", "vmxvre_volume_name_1": "vREXI_FAVolume", "vmxvre_ore_present": "0", "vmxvre_volume_name_0": "vREXI_FBVolume", @@ -889,7 +945,7 @@ "vmxvpfe_sriov41_0_port_broadcastallow": "true", "vmxvre_volume_id_1": "6e86797e-03cd-4fdc-ba72-2957119c746d", "vmxvpfe_sriov41_0_port_vlanfilter": "4001", - "nf_role": "vPE", + "nf_role": "Testing", "vmxvre_volume_id_0": "f4eacb79-f687-4e9d-b760-21847c8bb15a", "vmxvpfe_sriov42_0_port_unknownunicastallow": "true", "vmxvpfe_flavor_name": "ns.c20r16d25.v5" @@ -898,12 +954,12 @@ "modelCustomizationName": "2017-488_ADIOD-vPE 0", "vfModules": { "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": { - "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df", + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5", "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", - "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3", + "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", "description": null, "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", - "version": "8", + "version": "6", "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", "properties": { "minCountInstances": 0, @@ -912,20 +968,7 @@ "vfModuleLabel": "ADIOD_vRE_BV" }, "inputs": { - "2017488_adiodvpe0_bandwidth_units": { - "type": "string", - "description": "Units of bandwidth", - "entry_schema": null, - "inputProperties": { - "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", - "paramName": "bandwidth_units" - }, - "constraints": null, - "required": true, - "default": "Gbps" - }, - "2017488_adiodvpe0_bandwidth": { + "adiodvpe0_bandwidth": { "type": "string", "description": "Requested VPE bandwidth", "entry_schema": null, @@ -976,17 +1019,30 @@ "constraints": null, "required": true, "default": "ATLMY8GA" + }, + "adiodvpe0_bandwidth_units": { + "type": "string", + "description": "Units of bandwidth", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "bandwidth_units" + }, + "constraints": null, + "required": true, + "default": "Gbps" } }, "volumeGroupAllowed": true }, "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": { - "uuid": "040e591e-5d30-4e0d-850f-7266e5a8e013", + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db", "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091", - "customizationUuid": "5c5f91f9-5e31-4120-b892-5536587ec258", + "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", "description": null, "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0", - "version": "6", + "version": "5", "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0", "properties": { "minCountInstances": 1, @@ -998,12 +1054,12 @@ "volumeGroupAllowed": false }, "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": { - "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe", + "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a", "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339", - "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452", + "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557", "description": null, "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", - "version": "8", + "version": "6", "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", "properties": { "minCountInstances": 0, @@ -1011,32 +1067,18 @@ "initialCount": 0, "vfModuleLabel": "ADIOD_vPFE_BV" }, - "inputs": { - "2017488_adiodvpe0_availability_zone_0": { - "type": "string", - "description": "The Availability Zone to launch the instance.", - "entry_schema": null, - "inputProperties": { - "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vPFE_BV", - "paramName": "availability_zone_0" - }, - "constraints": null, - "required": true, - "default": "mtpocfo-kvm-az01" - } - }, + "inputs": {}, "volumeGroupAllowed": true } }, "volumeGroups": { "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": { - "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df", + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5", "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", - "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3", + "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", "description": null, "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", - "version": "8", + "version": "6", "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", "properties": { "minCountInstances": 0, @@ -1045,20 +1087,7 @@ "vfModuleLabel": "ADIOD_vRE_BV" }, "inputs": { - "2017488_adiodvpe0_bandwidth_units": { - "type": "string", - "description": "Units of bandwidth", - "entry_schema": null, - "inputProperties": { - "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", - "paramName": "bandwidth_units" - }, - "constraints": null, - "required": true, - "default": "Gbps" - }, - "2017488_adiodvpe0_bandwidth": { + "adiodvpe0_bandwidth": { "type": "string", "description": "Requested VPE bandwidth", "entry_schema": null, @@ -1109,16 +1138,29 @@ "constraints": null, "required": true, "default": "ATLMY8GA" + }, + "adiodvpe0_bandwidth_units": { + "type": "string", + "description": "Units of bandwidth", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "bandwidth_units" + }, + "constraints": null, + "required": true, + "default": "Gbps" } } }, "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": { - "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe", + "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a", "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339", - "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452", + "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557", "description": null, "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", - "version": "8", + "version": "6", "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", "properties": { "minCountInstances": 0, @@ -1126,21 +1168,7 @@ "initialCount": 0, "vfModuleLabel": "ADIOD_vPFE_BV" }, - "inputs": { - "2017488_adiodvpe0_availability_zone_0": { - "type": "string", - "description": "The Availability Zone to launch the instance.", - "entry_schema": null, - "inputProperties": { - "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vPFE_BV", - "paramName": "availability_zone_0" - }, - "constraints": null, - "required": true, - "default": "mtpocfo-kvm-az01" - } - } + "inputs": {} } }, "vfcInstanceGroups": {} @@ -1152,12 +1180,12 @@ "serviceProxies": {}, "vfModules": { "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": { - "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df", + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5", "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", - "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3", + "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", "description": null, "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", - "version": "8", + "version": "6", "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", "properties": { "minCountInstances": 0, @@ -1166,20 +1194,7 @@ "vfModuleLabel": "ADIOD_vRE_BV" }, "inputs": { - "2017488_adiodvpe0_bandwidth_units": { - "type": "string", - "description": "Units of bandwidth", - "entry_schema": null, - "inputProperties": { - "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", - "paramName": "bandwidth_units" - }, - "constraints": null, - "required": true, - "default": "Gbps" - }, - "2017488_adiodvpe0_bandwidth": { + "adiodvpe0_bandwidth": { "type": "string", "description": "Requested VPE bandwidth", "entry_schema": null, @@ -1230,17 +1245,30 @@ "constraints": null, "required": true, "default": "ATLMY8GA" + }, + "adiodvpe0_bandwidth_units": { + "type": "string", + "description": "Units of bandwidth", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "bandwidth_units" + }, + "constraints": null, + "required": true, + "default": "Gbps" } }, "volumeGroupAllowed": true }, "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_base_vPE_BV..module-0": { - "uuid": "040e591e-5d30-4e0d-850f-7266e5a8e013", + "uuid": "f8360508-3f17-4414-a2ed-6bc71161e8db", "invariantUuid": "b34833bb-6aa9-4ad6-a831-70b06367a091", - "customizationUuid": "5c5f91f9-5e31-4120-b892-5536587ec258", + "customizationUuid": "a55961b2-2065-4ab0-a5b7-2fcee1c227e3", "description": null, "name": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0", - "version": "6", + "version": "5", "modelCustomizationName": "2017488AdiodVpe..ADIOD_base_vPE_BV..module-0", "properties": { "minCountInstances": 1, @@ -1252,12 +1280,12 @@ "volumeGroupAllowed": false }, "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": { - "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe", + "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a", "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339", - "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452", + "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557", "description": null, "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", - "version": "8", + "version": "6", "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", "properties": { "minCountInstances": 0, @@ -1265,32 +1293,18 @@ "initialCount": 0, "vfModuleLabel": "ADIOD_vPFE_BV" }, - "inputs": { - "2017488_adiodvpe0_availability_zone_0": { - "type": "string", - "description": "The Availability Zone to launch the instance.", - "entry_schema": null, - "inputProperties": { - "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vPFE_BV", - "paramName": "availability_zone_0" - }, - "constraints": null, - "required": true, - "default": "mtpocfo-kvm-az01" - } - }, + "inputs": {}, "volumeGroupAllowed": true } }, "volumeGroups": { "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": { - "uuid": "a5d8df05-11cb-4351-96e0-b6d4168ea4df", + "uuid": "25284168-24bb-4698-8cb4-3f509146eca5", "invariantUuid": "7253ff5c-97f0-4b8b-937c-77aeb4d79aa1", - "customizationUuid": "f3d97417-0c8d-424e-8ff7-b2eb4fbcecc3", + "customizationUuid": "f7e7c365-60cf-49a9-9ebf-a1aa11b9d401", "description": null, "name": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", - "version": "8", + "version": "6", "modelCustomizationName": "2017488AdiodVpe..ADIOD_vRE_BV..module-1", "properties": { "minCountInstances": 0, @@ -1299,20 +1313,7 @@ "vfModuleLabel": "ADIOD_vRE_BV" }, "inputs": { - "2017488_adiodvpe0_bandwidth_units": { - "type": "string", - "description": "Units of bandwidth", - "entry_schema": null, - "inputProperties": { - "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vRE_BV", - "paramName": "bandwidth_units" - }, - "constraints": null, - "required": true, - "default": "Gbps" - }, - "2017488_adiodvpe0_bandwidth": { + "adiodvpe0_bandwidth": { "type": "string", "description": "Requested VPE bandwidth", "entry_schema": null, @@ -1363,16 +1364,29 @@ "constraints": null, "required": true, "default": "ATLMY8GA" + }, + "adiodvpe0_bandwidth_units": { + "type": "string", + "description": "Units of bandwidth", + "entry_schema": null, + "inputProperties": { + "sourceType": "HEAT", + "vfModuleLabel": "ADIOD_vRE_BV", + "paramName": "bandwidth_units" + }, + "constraints": null, + "required": true, + "default": "Gbps" } } }, "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vPFE_BV..module-2": { - "uuid": "b3e8b26e-cff0-49fc-a4e6-f3e16c8440fe", + "uuid": "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a", "invariantUuid": "eff8cc59-53a1-4101-aed7-8cf24ecf8339", - "customizationUuid": "6e410843-257c-46d9-ba8a-8d94e1362452", + "customizationUuid": "3cd946bb-50e0-40d8-96d3-c9023520b557", "description": null, "name": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", - "version": "8", + "version": "6", "modelCustomizationName": "2017488AdiodVpe..ADIOD_vPFE_BV..module-2", "properties": { "minCountInstances": 0, @@ -1380,21 +1394,7 @@ "initialCount": 0, "vfModuleLabel": "ADIOD_vPFE_BV" }, - "inputs": { - "2017488_adiodvpe0_availability_zone_0": { - "type": "string", - "description": "The Availability Zone to launch the instance.", - "entry_schema": null, - "inputProperties": { - "sourceType": "HEAT", - "vfModuleLabel": "ADIOD_vPFE_BV", - "paramName": "availability_zone_0" - }, - "constraints": null, - "required": true, - "default": "mtpocfo-kvm-az01" - } - } + "inputs": {} } }, "pnfs": {} @@ -1402,15 +1402,20 @@ }, "serviceInstance": { "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd": { + "existingVNFCounterMap": { + "280dec31-f16d-488b-9668-4aae55d6648a": 1, + "1da7b585-5e61-4993-b95e-8e6606c81e45": 1 + }, "vnfs": { "2017-388_ADIOD-vPE 1": { "rollbackOnFailure": "false", "vfModules": {}, "productFamilyId": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e", - "lcpCloudRegionId": "mtn6", + "lcpCloudRegionId": "hvf6", "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e", "lineOfBusiness": "zzz1", "platformName": "platform", + "originalName": "2017-388_ADIOD-vPE 1", "modelInfo": { "modelType": "service", "modelInvariantId": "00beb8f9-6d39-452f-816d-c709b9cbb87d", @@ -1419,11 +1424,11 @@ "modelVersion": "1.0", "modelCustomizationId": "280dec31-f16d-488b-9668-4aae55d6648a", "modelCustomizationName": "2017-388_ADIOD-vPE 1" - }, - "isUserProvidedNaming": false + } }, "2017-488_ADIOD-vPE 0": { "rollbackOnFailure": "false", + "originalName": "2017-488_ADIOD-vPE 0", "vfModules": { "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": { "2017488_adiodvpe0..2017488AdiodVpe..ADIOD_vRE_BV..module-1": { @@ -1448,9 +1453,9 @@ } }, "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034", - "lcpCloudRegionId": "mtn6", + "lcpCloudRegionId": "hvf6", "tenantId": "229bcdc6eaeb4ca59d55221141d01f8e", - "lineOfBusiness": "ECOMP", + "lineOfBusiness": "ONAP", "platformName": "platform", "modelInfo": { "modelType": "service", @@ -1460,8 +1465,7 @@ "modelVersion": "5.0", "modelCustomizationId": "1da7b585-5e61-4993-b95e-8e6606c81e45", "modelCustomizationName": "2017-488_ADIOD-vPE 0" - }, - "isUserProvidedNaming": false + } } }, "instanceParams": [ @@ -1471,11 +1475,11 @@ ], "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034", - "subscriptionServiceType": "VIRTUAL USP", - "lcpCloudRegionId": "AAIAIC25", + "subscriptionServiceType": "TYLER SILVIA", + "lcpCloudRegionId": "JANET25", "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", "aicZoneId": "JAG1", - "projectName": "DFW", + "projectName": "WATKINS", "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", "bulkSize": 1, "modelInfo": { @@ -1485,7 +1489,7 @@ "modelName": "action-data", "modelVersion": "1.0" }, - "isUserProvidedNaming": false, + "isEcompGeneratedNaming": true, "tenantName": "USP-SIP-IC-24335-T-01", "aicZoneName": "YUDFJULP-JAG1" } @@ -1493,28 +1497,28 @@ "lcpRegionsAndTenants": { "lcpRegionList": [ { - "id": "AAIAIC25", - "name": "AAIAIC25", + "id": "JANET25", + "name": "JANET25", "isPermitted": true }, { - "id": "mtn6", - "name": "mtn6", + "id": "hvf6", + "name": "hvf6", "isPermitted": true } ], "lcpRegionsTenantsMap": { - "AAIAIC25": [ + "JANET25": [ { "id": "092eb9e8e4b7412e8787dd091bc58e86", "name": "USP-SIP-IC-24335-T-01", "isPermitted": true } ], - "mtn6": [ + "hvf6": [ { "id": "bae71557c5bb4d5aac6743a4e5f1d054", - "name": "AIN Web Tool-15-D-testgamma", + "name": "AIN Web Tool-15-D-testalexandria", "isPermitted": true }, { @@ -1654,7 +1658,7 @@ }, { "id": "d0a3e3f2964542259d155a81c41aadc3", - "name": "test-mtn6-09", + "name": "test-hvf6-09", "isPermitted": true }, { @@ -1668,34 +1672,34 @@ "subscribers": [ { "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "name": "Mobility", + "name": "Emanuel", "isPermitted": false }, { "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fc", - "name": "PACKET CORE", + "name": "JULIO ERICKSON", "isPermitted": false }, { "id": "e433710f-9217-458d-a79d-1c7aff376d89", - "name": "USP VOICE", + "name": "SILVIA ROBBINS", "isPermitted": true } ], "productFamilies": [ { "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034", - "name": "DHV", + "name": "SCOTTIE", "isPermitted": true }, { "id": "17cc1042-527b-11e6-beb8-9e71128cae77", - "name": "FLEXREACH", + "name": "IGNACIO", "isPermitted": true }, { "id": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e", - "name": "Netbond", + "name": "Christie", "isPermitted": true }, { @@ -1704,8 +1708,8 @@ "isPermitted": true }, { - "id": "vRRaaS", - "name": "vRRaaS", + "id": "vTerrance", + "name": "vTerrance", "isPermitted": true }, { @@ -1715,7 +1719,7 @@ }, { "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "name": "Mobility", + "name": "Emanuel", "isPermitted": true }, { @@ -1725,7 +1729,7 @@ }, { "id": "db171b8f-115c-4992-a2e3-ee04cae357e0", - "name": "FIRSTNET", + "name": "LINDSEY", "isPermitted": true }, { @@ -1734,18 +1738,18 @@ "isPermitted": true }, { - "id": "vHNGWaas", + "id": "vRosemarie", "name": "HNGATEWAY", "isPermitted": true }, { "id": "vHNPaas", - "name": "HNPORTAL", + "name": "WILKINS", "isPermitted": true }, { "id": "e433710f-9217-458d-a79d-1c7aff376d89", - "name": "VIRTUAL USP", + "name": "TYLER SILVIA", "isPermitted": true }, { @@ -1754,18 +1758,18 @@ "isPermitted": true }, { - "id": "VIPRaaS", - "name": "vIPRaaS", + "id": "Cisneros", + "name": "vMuriel", "isPermitted": true }, { "id": "0ee8c1bc-7cbd-4b0a-a1ac-e9999255abc1", - "name": "WAN Bonding", + "name": "CARA Griffin", "isPermitted": true }, { "id": "c7611ebe-c324-48f1-8085-94aef0c6ef3d", - "name": "HOSTED COMMUNICATIONS", + "name": "DARREN MCGEE", "isPermitted": true }, { @@ -1774,23 +1778,23 @@ "isPermitted": true }, { - "id": "vVIGaaS", - "name": "vVIGaaS", + "id": "vSalvatore", + "name": "vSalvatore", "isPermitted": true }, { "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4", - "name": "uCPE-VMS", + "name": "Josefina", "isPermitted": true }, { - "id": "vPEaaS", - "name": "vPEaaS", + "id": "vHubbard", + "name": "vHubbard", "isPermitted": true }, { "id": "12a96a9d-4b4c-4349-a950-fe1159602621", - "name": "HOSTED COMMUNICATIONS", + "name": "DARREN MCGEE", "isPermitted": true } ], @@ -1798,22 +1802,22 @@ "e433710f-9217-458d-a79d-1c7aff376d89": [ { "id": "0", - "name": "vFlowLogic", + "name": "vRichardson", "isPermitted": false }, { "id": "1", - "name": "VIRTUAL USP", + "name": "TYLER SILVIA", "isPermitted": true }, { "id": "2", - "name": "Mobility", + "name": "Emanuel", "isPermitted": false }, { "id": "3", - "name": "vBNG", + "name": "vJamie", "isPermitted": false }, { @@ -1823,7 +1827,7 @@ }, { "id": "5", - "name": "Nimbus", + "name": "Kennedy", "isPermitted": false }, { @@ -1878,17 +1882,17 @@ }, { "id": "16", - "name": "FIRSTNET", + "name": "LINDSEY", "isPermitted": false }, { "id": "17", - "name": "ACTIVE_CHARGE", + "name": "JOHANNA_SANTOS", "isPermitted": false }, { "id": "18", - "name": "vHSS", + "name": "vCarroll", "isPermitted": false } ] @@ -2671,17 +2675,17 @@ }, { "id": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", - "name": "MetroPacketCore" + "name": "WayneHolland" }, { - "id": "Wireline", - "name": "Wireline" + "id": "Melissa", + "name": "Melissa" } ], "projectList": [ { - "id": "DFW", - "name": "DFW" + "id": "WATKINS", + "name": "WATKINS" }, { "id": "x1", @@ -2694,8 +2698,8 @@ ], "lineOfBusinessList": [ { - "id": "ECOMP", - "name": "ECOMP" + "id": "ONAP", + "name": "ONAP" }, { "id": "zzz1", diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/subscribers.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/subscribers.json index 088fbe7ea..2d1ee5ae7 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/subscribers.json +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/subscribers.json @@ -2,21 +2,21 @@ "customer": [ { "global-customer-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", - "subscriber-name": "Mobility", + "subscriber-name": "Emanuel", "subscriber-type": "INFRA", "resource-version": "1494255056308", "is-permitted": false }, { "global-customer-id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fc", - "subscriber-name": "PACKET CORE", + "subscriber-name": "JULIO ERICKSON", "subscriber-type": "INFRA", "resource-version": "1506548476111", "is-permitted": false }, { "global-customer-id": "e433710f-9217-458d-a79d-1c7aff376d89", - "subscriber-name": "USP VOICE", + "subscriber-name": "SILVIA ROBBINS", "subscriber-type": "INFRA", "is-permitted": true } diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/tenants.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/tenants.json new file mode 100644 index 000000000..30d53b4ff --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/tenants.json @@ -0,0 +1,233 @@ +[ + { + "cloudOwner": "irma-aic", + "tenantName": "USP-SIP-IC-24335-T-01", + "tenantID": "092eb9e8e4b7412e8787dd091bc58e86", + "cloudRegionID": "JANET25", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "AIN Web Tool-15-D-testalexandria", + "tenantID": "bae71557c5bb4d5aac6743a4e5f1d054", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "AIN Web Tool-15-D-STTest2", + "tenantID": "229bcdc6eaeb4ca59d55221141d01f8e", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "AIN Web Tool-15-D-SSPtestcustome", + "tenantID": "1178612d2b394be4834ad77f567c0af2", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "AIN Web Tool-15-D-UncheckedEcopm", + "tenantID": "19c5ade915eb461e8af52fb2fd8cd1f2", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "AIN Web Tool-15-D-dfsdf", + "tenantID": "de007636e25249238447264a988a927b", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "AIN/SMS-16-D-Multiservices1", + "tenantID": "62f29b3613634ca6a3065cbe0e020c44", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "AIN Web Tool-15-D-SSPST66", + "tenantID": "649289e30d3244e0b48098114d63c2aa", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "AIN Web Tool-15-D-ASSPST47", + "tenantID": "3f21eeea6c2c486bba31dab816c05a32", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "CESAR-100-D-sspjg67246", + "tenantID": "f60ce21d3ee6427586cff0d22b03b773", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "CESAR-100-D-sspjg68359", + "tenantID": "8774659e425f479895ae091bb5d46560", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "AINWebTool-15-D-iftach", + "tenantID": "624eb554b0d147c19ff8885341760481", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "CESAR-100-D-sspjg612401", + "tenantID": "214f55f5fc414c678059c383b03e4962", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "CESAR-100-D-sspjg621340", + "tenantID": "c90666c291664841bb98e4d981ff1db5", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "sspjg621351cloned", + "tenantID": "ce5b6bc5c7b348e1bf4b91ac9a174278", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "AINWebTool-15-D-eteancomp", + "tenantID": "b386b768a3f24c8e953abbe0b3488c02", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "AINWebTool-15-T-SPFET", + "tenantID": "dc6c4dbfd225474e9deaadd34968646c", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "AINWebTool-15-X-eeweww", + "tenantID": "02cb5030e9914aa4be120bd9ed1e19eb", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "CESAR-100-D-spjg61909", + "tenantID": "f2f3830e4c984d45bcd00e1a04158a79", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "CESAR-100-D-sspjg621512cloned", + "tenantID": "05b91bd5137f4929878edd965755c06d", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "AINWebTool-15-X-vdr", + "tenantID": "7002fbe8482d4a989ddf445b1ce336e0", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "AINWebTool-15-D-ssasa", + "tenantID": "4008522be43741dcb1f5422022a2aa0b", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "AINWebTool-15-D-PFNPT", + "tenantID": "f44e2e96a1b6476abfda2fa407b00169", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "AINWebTool-15-X-vdre", + "tenantID": "b69a52bec8a84669a37a1e8b72708be7", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "AINWebTool-15-X-NONPODECOMP", + "tenantID": "fac7d9fd56154caeb9332202dcf2969f", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "DN5242-Nov16-T5", + "tenantID": "2d34d8396e194eb49969fd61ffbff961", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "ro-T11", + "tenantID": "cb42a77ff45b48a8b8deb83bb64acc74", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "ro-T112", + "tenantID": "fa45ca53c80b492fa8be5477cd84fc2b", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "DN5242-Nov21-T1", + "tenantID": "4914ab0ab3a743e58f0eefdacc1dde77", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "test-hvf6-09", + "tenantID": "d0a3e3f2964542259d155a81c41aadc3", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "DN5242-Nov16-T3", + "tenantID": "cbb99fe4ada84631b7baf046b6fd2044", + "cloudRegionID": "hvf6", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "DN5242-Nov16-T3XXX", + "tenantID": "cbb99fe4ada84631b7baf046b6fd2XXX", + "cloudRegionID": "olson3", + "is-permitted": true + }, + { + "cloudOwner": "irma-aic", + "tenantName": "DN5242-Nov16-T3YYY", + "tenantID": "cbb99fe4ada84631b7baf046b6fd2YYY", + "cloudRegionID": "olson5a", + "is-permitted": true + } +] diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/topMenuInfo.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/topMenuInfo.json index 92627f42b..4aefadd6e 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/topMenuInfo.json +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/topMenuInfo.json @@ -1,8 +1,8 @@ { - "contactUsLink": "https://wiki.web.att.com/display/EcompPortal/ECOMP+Portal+Home", + "contactUsLink": "https://www.openecomp.org/EcompPortal/ECOMP+Portal+Home", "firstName": "uspVoiceVirtualUsp", - "portalUrl": "https://www.e-access.att.com/ecomp_portal_dev_n1/ecompui/process_csp", - "getAccessUrl": "https://www.e-access.att.com/ecomp_portal_dev_n1/ecompui/get_access", + "portalUrl": "http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/process_csp", + "getAccessUrl": "http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/get_access", "userName": "uspVoiceVirtualUsp null", "userid": "uspVoiceVirtualUsp" } diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/version.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/version.json new file mode 100644 index 000000000..1559ef288 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/version.json @@ -0,0 +1,5 @@ +{ + "features": "1810.features.properties", + "build": "1.0.1481", + "displayVersion": "1902.1948" +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/vnfGroupBasicServiceInstance.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/vnfGroupBasicServiceInstance.json new file mode 100644 index 000000000..bba5ec19f --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/vnfGroupBasicServiceInstance.json @@ -0,0 +1,32 @@ +{ + "existingVNFCounterMap":{}, + "existingVnfGroupCounterMap":{}, + "existingNetworksCounterMap":{}, + "optionalGroupMembersMap":{}, + "vnfs":{}, + "vnfGroups":{}, + "instanceParams":[ + { + "2017488_adiodvpe0_ASN":"AV_vPE" + }], + "globalSubscriberId":"e433710f-9217-458d-a79d-1c7aff376d89", + "subscriptionServiceType":"TYLER SILVIA", + "projectName":"WATKINS", + "owningEntityId":"d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "bulkSize":1, + "modelInfo":{ + "modelType":"service", + "modelInvariantId":"7ee41ce4-4827-44b0-a48e-2707a59905d2", + "modelVersionId":"4117a0b6-e234-467d-b5b9-fe2f68c8b0fc", + "modelName":"Grouping Service for Test", + "modelVersion":"1.0" + }, + "existingNames":{}, + "instanceName": "Grouping_Service_Instance", + "subscriberName":"SILVIA ROBBINS", + "owningEntityName":"WayneHolland", + "rollbackOnFailure":"true", + "testApi": "VNF_API", + "isALaCarte":true, + "action": "Create" +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/vnfGroupsBasicModel.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/vnfGroupsBasicModel.json new file mode 100644 index 000000000..73e63663d --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/vnfGroupsBasicModel.json @@ -0,0 +1,1430 @@ +{ + "service": { + "serviceHierarchy": { + "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd": { + "service": { + "uuid": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", + "invariantUuid": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "name": "action-data", + "version": "1.0", + "toscaModelURL": null, + "category": "", + "serviceType": "", + "serviceRole": "", + "description": "", + "serviceEcompNaming": "true", + "instantiationType": "Macro", + "inputs": { + "2017488_adiodvpe0_ASN": { + "type": "string", + "description": "AV/PE", + "entry_schema": null, + "inputProperties": null, + "constraints": [], + "required": true, + "default": "AV_vPE" + } + } + }, + "vnfGroups": { + "ResourceGroup0": { + "type": "VnfGroup", + "uuid": "0903e1c0-8e03-4936-b5c2-260653b96413", + "invariantUuid": "00beb8f9-6d39-452f-816d-c709b9cbb87d", + "version": "1", + "name": "ResourceGroup0", + "modelCustomizationName": "ResourceGroup0", + "properties": { + "contained_resource_type": "VF", + "role": "SERVICE-ACCESS", + "function": "DATA", + "description": "DDD0", + "type": "LOAD-GROUP" + }, + "members": { + "vdbe_svc_vprs_proxy 0": { + "uuid": "65fadfa8-a0d9-443f-95ad-836cd044e26c", + "invariantUuid": "f4baae0c-b3a5-4ca1-a777-afbffe7010bc", + "description": "A Proxy for Service vDBE_Svc_vPRS", + "name": "vDBE_Svc_vPRS Service Proxy", + "version": "1.0", + "customizationUuid": "bdb63d23-e132-4ce7-af2c-a493b4cafac9", + "inputs": {}, + "commands": {}, + "properties": {}, + "type": "Service Proxy", + "sourceModelUuid": "da7827a2-366d-4be6-8c68-a69153c61274", + "sourceModelInvariant": "24632e6b-584b-4f45-80d4-fefd75fd9f14", + "sourceModelName": "vDBE_Svc_vPRS" + }, + "vdbe_svc_vprs_proxy 1": { + "uuid": "111dfa8-a0d9-443f-95ad-836cd044e26c", + "invariantUuid": "111ae0c-b3a5-4ca1-a777-afbffe7010bc", + "description": "A Proxy for Service vDBE_Svc_vPRS", + "name": "111_Svc_vPRS Service Proxy", + "version": "1.0", + "customizationUuid": "1113d23-e132-4ce7-af2c-a493b4cafac9", + "inputs": {}, + "commands": {}, + "properties": {}, + "type": "Service Proxy", + "sourceModelUuid": "11127a2-366d-4be6-8c68-a69153c61274", + "sourceModelInvariant": "1112e6b-584b-4f45-80d4-fefd75fd9f14", + "sourceModelName": "111_Svc_vPRS" + } + } + } + }, + "networks": {}, + "collectionResource": {}, + "configurations": {}, + "serviceProxies": {}, + "vfModules": {}, + "volumeGroups": {}, + "pnfs": {} + } + }, + "serviceInstance": { + "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd": { + "existingVNFCounterMap": {}, + "existingVnfGroupCounterMap": {}, + "existingNetworksCounterMap": {}, + "vnfs": {}, + "vnfGroups": {}, + "instanceParams": [ + { + "2017488_adiodvpe0_ASN": "AV_vPE" + } + ], + "globalSubscriberId": "e433710f-9217-458d-a79d-1c7aff376d89", + "productFamilyId": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034", + "subscriptionServiceType": "TYLER SILVIA", + "lcpCloudRegionId": "JANET25", + "tenantId": "092eb9e8e4b7412e8787dd091bc58e86", + "aicZoneId": "JAG1", + "projectName": "WATKINS", + "owningEntityId": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "bulkSize": 1, + "modelInfo": { + "modelType": "service", + "modelInvariantId": "e49fbd11-e60c-4a8e-b4bf-30fbe8f4fcc0", + "modelVersionId": "2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd", + "modelName": "action-data", + "modelVersion": "1.0" + }, + "isEcompGeneratedNaming": true, + "tenantName": "USP-SIP-IC-24335-T-01", + "aicZoneName": "YUDFJULP-JAG1", + "existingNames": {} + } + }, + "lcpRegionsAndTenants": { + "lcpRegionList": [ + { + "id": "JANET25", + "name": "JANET25 (AIC)", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "hvf6", + "name": "hvf6 (AIC)", + "isPermitted": true, + "cloudOwner": "irma-aic" + } + ], + "lcpRegionsTenantsMap": { + "JANET25": [ + { + "id": "092eb9e8e4b7412e8787dd091bc58e86", + "name": "USP-SIP-IC-24335-T-01", + "isPermitted": true, + "cloudOwner": "irma-aic" + } + ], + "hvf6": [ + { + "id": "bae71557c5bb4d5aac6743a4e5f1d054", + "name": "AIN Web Tool-15-D-testalexandria", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "229bcdc6eaeb4ca59d55221141d01f8e", + "name": "AIN Web Tool-15-D-STTest2", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "1178612d2b394be4834ad77f567c0af2", + "name": "AIN Web Tool-15-D-SSPtestcustome", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "19c5ade915eb461e8af52fb2fd8cd1f2", + "name": "AIN Web Tool-15-D-UncheckedEcopm", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "de007636e25249238447264a988a927b", + "name": "AIN Web Tool-15-D-dfsdf", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "62f29b3613634ca6a3065cbe0e020c44", + "name": "AIN/SMS-16-D-Multiservices1", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "649289e30d3244e0b48098114d63c2aa", + "name": "AIN Web Tool-15-D-SSPST66", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "3f21eeea6c2c486bba31dab816c05a32", + "name": "AIN Web Tool-15-D-ASSPST47", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "f60ce21d3ee6427586cff0d22b03b773", + "name": "CESAR-100-D-sspjg67246", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "8774659e425f479895ae091bb5d46560", + "name": "CESAR-100-D-sspjg68359", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "624eb554b0d147c19ff8885341760481", + "name": "AINWebTool-15-D-iftach", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "214f55f5fc414c678059c383b03e4962", + "name": "CESAR-100-D-sspjg612401", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "c90666c291664841bb98e4d981ff1db5", + "name": "CESAR-100-D-sspjg621340", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "ce5b6bc5c7b348e1bf4b91ac9a174278", + "name": "sspjg621351cloned", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "b386b768a3f24c8e953abbe0b3488c02", + "name": "AINWebTool-15-D-eteancomp", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "dc6c4dbfd225474e9deaadd34968646c", + "name": "AINWebTool-15-T-SPFET", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "02cb5030e9914aa4be120bd9ed1e19eb", + "name": "AINWebTool-15-X-eeweww", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "f2f3830e4c984d45bcd00e1a04158a79", + "name": "CESAR-100-D-spjg61909", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "05b91bd5137f4929878edd965755c06d", + "name": "CESAR-100-D-sspjg621512cloned", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "7002fbe8482d4a989ddf445b1ce336e0", + "name": "AINWebTool-15-X-vdr", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "4008522be43741dcb1f5422022a2aa0b", + "name": "AINWebTool-15-D-ssasa", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "f44e2e96a1b6476abfda2fa407b00169", + "name": "AINWebTool-15-D-PFNPT", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "b69a52bec8a84669a37a1e8b72708be7", + "name": "AINWebTool-15-X-vdre", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "fac7d9fd56154caeb9332202dcf2969f", + "name": "AINWebTool-15-X-NONPODECOMP", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "2d34d8396e194eb49969fd61ffbff961", + "name": "DN5242-Nov16-T5", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "cb42a77ff45b48a8b8deb83bb64acc74", + "name": "ro-T11", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "fa45ca53c80b492fa8be5477cd84fc2b", + "name": "ro-T112", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "4914ab0ab3a743e58f0eefdacc1dde77", + "name": "DN5242-Nov21-T1", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "d0a3e3f2964542259d155a81c41aadc3", + "name": "test-hvf6-09", + "isPermitted": true, + "cloudOwner": "irma-aic" + }, + { + "id": "cbb99fe4ada84631b7baf046b6fd2044", + "name": "DN5242-Nov16-T3", + "isPermitted": true, + "cloudOwner": "irma-aic" + } + ] + } + }, + "subscribers": [ + { + "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "name": "Emanuel", + "isPermitted": false + }, + { + "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fc", + "name": "JULIO ERICKSON", + "isPermitted": false + }, + { + "id": "e433710f-9217-458d-a79d-1c7aff376d89", + "name": "SILVIA ROBBINS", + "isPermitted": true + } + ], + "productFamilies": [ + { + "id": "ebc3bc3d-62fd-4a3f-a037-f619df4ff034", + "name": "SCOTTIE", + "isPermitted": true + }, + { + "id": "17cc1042-527b-11e6-beb8-9e71128cae77", + "name": "IGNACIO", + "isPermitted": true + }, + { + "id": "36b4733a-53f4-4cc8-8ff0-9172e5fc4b8e", + "name": "Christie", + "isPermitted": true + }, + { + "id": "a4f6f2ae-9bf5-4ed7-b904-06b2099c4bd7", + "name": "Enhanced Services", + "isPermitted": true + }, + { + "id": "vTerrance", + "name": "vTerrance", + "isPermitted": true + }, + { + "id": "323d69d9-2efe-4r45-ay0a-89ea7ard4e6f", + "name": "vSCP", + "isPermitted": true + }, + { + "id": "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb", + "name": "Emanuel", + "isPermitted": true + }, + { + "id": "d8a6ed93-251c-47ca-adc9-86671fd19f4c", + "name": "BVOIP", + "isPermitted": true + }, + { + "id": "db171b8f-115c-4992-a2e3-ee04cae357e0", + "name": "LINDSEY", + "isPermitted": true + }, + { + "id": "LRSI-OSPF", + "name": "LRSI-OSPF", + "isPermitted": true + }, + { + "id": "vRosemarie", + "name": "HNGATEWAY", + "isPermitted": true + }, + { + "id": "vHNPaas", + "name": "WILKINS", + "isPermitted": true + }, + { + "id": "e433710f-9217-458d-a79d-1c7aff376d89", + "name": "TYLER SILVIA", + "isPermitted": true + }, + { + "id": "b6a3f28c-eebf-494c-a900-055cc7c874ce", + "name": "VROUTER", + "isPermitted": true + }, + { + "id": "Cisneros", + "name": "vMuriel", + "isPermitted": true + }, + { + "id": "0ee8c1bc-7cbd-4b0a-a1ac-e9999255abc1", + "name": "CARA Griffin", + "isPermitted": true + }, + { + "id": "c7611ebe-c324-48f1-8085-94aef0c6ef3d", + "name": "DARREN MCGEE", + "isPermitted": true + }, + { + "id": "e30755dc-5673-4b6b-9dcf-9abdd96b93d1", + "name": "Transport", + "isPermitted": true + }, + { + "id": "vSalvatore", + "name": "vSalvatore", + "isPermitted": true + }, + { + "id": "d7bb0a21-66f2-4e6d-87d9-9ef3ced63ae4", + "name": "Josefina", + "isPermitted": true + }, + { + "id": "vHubbard", + "name": "vHubbard", + "isPermitted": true + }, + { + "id": "12a96a9d-4b4c-4349-a950-fe1159602621", + "name": "DARREN MCGEE", + "isPermitted": true + } + ], + "serviceTypes": { + "e433710f-9217-458d-a79d-1c7aff376d89": [ + { + "id": "0", + "name": "vRichardson", + "isPermitted": false + }, + { + "id": "1", + "name": "TYLER SILVIA", + "isPermitted": true + }, + { + "id": "2", + "name": "Emanuel", + "isPermitted": false + }, + { + "id": "3", + "name": "vJamie", + "isPermitted": false + }, + { + "id": "4", + "name": "vVoiceMail", + "isPermitted": false + }, + { + "id": "5", + "name": "Kennedy", + "isPermitted": false + }, + { + "id": "6", + "name": "vSEGW", + "isPermitted": false + }, + { + "id": "7", + "name": "vVM", + "isPermitted": false + }, + { + "id": "8", + "name": "vOTA", + "isPermitted": false + }, + { + "id": "9", + "name": "vMME", + "isPermitted": false + }, + { + "id": "10", + "name": "vMNS", + "isPermitted": false + }, + { + "id": "11", + "name": "vSCP", + "isPermitted": false + }, + { + "id": "12", + "name": "VPMS", + "isPermitted": false + }, + { + "id": "13", + "name": "vMMSC", + "isPermitted": false + }, + { + "id": "14", + "name": "SSD", + "isPermitted": false + }, + { + "id": "15", + "name": "vMOG", + "isPermitted": false + }, + { + "id": "16", + "name": "LINDSEY", + "isPermitted": false + }, + { + "id": "17", + "name": "JOHANNA_SANTOS", + "isPermitted": false + }, + { + "id": "18", + "name": "vCarroll", + "isPermitted": false + } + ] + }, + "aicZones": [ + { + "id": "NFT1", + "name": "NFTJSSSS-NFT1" + }, + { + "id": "JAG1", + "name": "YUDFJULP-JAG1" + }, + { + "id": "YYY1", + "name": "UUUAIAAI-YYY1" + }, + { + "id": "BAN1", + "name": "VSDKYUTP-BAN1" + }, + { + "id": "DKJ1", + "name": "DKJSJDKA-DKJ1" + }, + { + "id": "MCS1", + "name": "ASACMAMS-MCS1" + }, + { + "id": "UIO1", + "name": "uioclli1-UIO1" + }, + { + "id": "RAJ1", + "name": "YGBIJNLQ-RAJ1" + }, + { + "id": "OPA1", + "name": "opaclli1-OPA1" + }, + { + "id": "SDE1", + "name": "ZXCVBNMA-SDE1" + }, + { + "id": "VEN2", + "name": "FGHJUHIL-VEN2" + }, + { + "id": "ORL1", + "name": "ORLDFLMA-ORL1" + }, + { + "id": "JAD1", + "name": "JADECLLI-JAD1" + }, + { + "id": "ZXL1", + "name": "LWLWCANN-ZXL1" + }, + { + "id": "CKL1", + "name": "CLKSKCKK-CKL1" + }, + { + "id": "SDF1", + "name": "sdfclli1-SDF1" + }, + { + "id": "RAD1", + "name": "RADICAL1-RAD1" + }, + { + "id": "KIT1", + "name": "BHYJFGLN-KIT1" + }, + { + "id": "REL1", + "name": "INGERFGT-REL1" + }, + { + "id": "JNL1", + "name": "CJALSDAC-JNL1" + }, + { + "id": "OLK1", + "name": "OLKOLKLS-OLK1" + }, + { + "id": "CHI1", + "name": "CHILLIWE-CHI1" + }, + { + "id": "UUU4", + "name": "UUUAAAUU-UUU4" + }, + { + "id": "TUF1", + "name": "TUFCLLI1-TUF1" + }, + { + "id": "KJN1", + "name": "CKALDKSA-KJN1" + }, + { + "id": "SAM1", + "name": "SNDGCA64-SAN1" + }, + { + "id": "SCK1", + "name": "SCKSCKSK-SCK1" + }, + { + "id": "HJH1", + "name": "AOEEQQQD-HJH1" + }, + { + "id": "HGD1", + "name": "SDFQWHGD-HGD1" + }, + { + "id": "KOR1", + "name": "HYFLNBVT-KOR1" + }, + { + "id": "ATL43", + "name": "AICLOCID-ATL43" + }, + { + "id": "ATL54", + "name": "AICFTAAI-ATL54" + }, + { + "id": "ATL66", + "name": "CLLIAAII-ATL66" + }, + { + "id": "VEL1", + "name": "BNMLKUIK-VEL1" + }, + { + "id": "ICC1", + "name": "SANJITAT-ICC1" + }, + { + "id": "MNT11", + "name": "WSXEFBTH-MNT11" + }, + { + "id": "DEF2", + "name": "WSBHGTYL-DEF2" + }, + { + "id": "MAD11", + "name": "SDFQWGKL-MAD11" + }, + { + "id": "OLG1", + "name": "OLHOLHOL-OLG1" + }, + { + "id": "GAR1", + "name": "NGFVSJKO-GAR1" + }, + { + "id": "SAN22", + "name": "GNVLSCTL-SAN22" + }, + { + "id": "HRG1", + "name": "HRGHRGGS-HRG1" + }, + { + "id": "JCS1", + "name": "JCSJSCJS-JCS1" + }, + { + "id": "DHA12", + "name": "WSXEDECF-DHA12" + }, + { + "id": "HJE1", + "name": "AOEEWWWD-HJE1" + }, + { + "id": "NCA1", + "name": "NCANCANN-NCA1" + }, + { + "id": "IOP1", + "name": "iopclli1-IOP1" + }, + { + "id": "RTY1", + "name": "rtyclli1-RTY1" + }, + { + "id": "KAP1", + "name": "HIOUYTRQ-KAP1" + }, + { + "id": "ZEN1", + "name": "ZENCLLI1-ZEN1" + }, + { + "id": "HKA1", + "name": "JAKHLASS-HKA1" + }, + { + "id": "CQK1", + "name": "CQKSCAKK-CQK1" + }, + { + "id": "SAI1", + "name": "UBEKQLPD-SAI1" + }, + { + "id": "ERT1", + "name": "ertclli1-ERT1" + }, + { + "id": "IBB1", + "name": "PLMKOIJU-IBB1" + }, + { + "id": "TIR2", + "name": "PLKINHYI-TIR2" + }, + { + "id": "HSD1", + "name": "CHASKCDS-HSD1" + }, + { + "id": "SLF78", + "name": "SDCTLFN1-SLF78" + }, + { + "id": "SEE78", + "name": "SDCTEEE4-SEE78" + }, + { + "id": "SAN13", + "name": "TOKYJPFA-SAN13" + }, + { + "id": "SAA78", + "name": "SDCTAAA1-SAA78" + }, + { + "id": "LUC1", + "name": "ATLDFGYC-LUC1" + }, + { + "id": "AMD13", + "name": "MEMATLAN-AMD13" + }, + { + "id": "TOR1", + "name": "TOROONXN-TOR1" + }, + { + "id": "QWE1", + "name": "QWECLLI1-QWE1" + }, + { + "id": "ZOG1", + "name": "ZOGASTRO-ZOG1" + }, + { + "id": "CAL33", + "name": "CALIFORN-CAL33" + }, + { + "id": "SHH78", + "name": "SDIT1HHH-SHH78" + }, + { + "id": "DSA1", + "name": "LKJHGFDS-DSA1" + }, + { + "id": "CLG1", + "name": "CLGRABAD-CLG1" + }, + { + "id": "BNA1", + "name": "BNARAGBK-BNA1" + }, + { + "id": "ATL84", + "name": "CANTTCOC-ATL84" + }, + { + "id": "APP1", + "name": "WBHGTYUI-APP1" + }, + { + "id": "RJN1", + "name": "RJNRBZAW-RJN1" + }, + { + "id": "EHH78", + "name": "SDCSHHH5-EHH78" + }, + { + "id": "mac10", + "name": "PKGTESTF-mac10" + }, + { + "id": "SXB78", + "name": "SDCTGXB1-SXB78" + }, + { + "id": "SAX78", + "name": "SDCTAXG1-SAX78" + }, + { + "id": "SYD1", + "name": "SYDNAUBV-SYD1" + }, + { + "id": "TOK1", + "name": "TOKYJPFA-TOK1" + }, + { + "id": "KGM2", + "name": "KGMTNC20-KGM2" + }, + { + "id": "DCC1b", + "name": "POIUYTGH-DCC1b" + }, + { + "id": "SKK78", + "name": "SDCTKKK1-SKK78" + }, + { + "id": "SGG78", + "name": "SDCTGGG1-SGG78" + }, + { + "id": "SJJ78", + "name": "SDCTJJJ1-SJJ78" + }, + { + "id": "SBX78", + "name": "SDCTBXG1-SBX78" + }, + { + "id": "LAG1", + "name": "LARGIZON-LAG1" + }, + { + "id": "IAA1", + "name": "QAZXSWED-IAA1" + }, + { + "id": "POI1", + "name": "PLMNJKIU-POI1" + }, + { + "id": "LAG1a", + "name": "LARGIZON-LAG1a" + }, + { + "id": "PBL1", + "name": "PBLAPBAI-PBL1" + }, + { + "id": "LAG45", + "name": "LARGIZON-LAG1a" + }, + { + "id": "MAR1", + "name": "MNBVCXZM-MAR1" + }, + { + "id": "HST70", + "name": "HSTNTX70-HST70" + }, + { + "id": "DCC1a", + "name": "POIUYTGH-DCC1a" + }, + { + "id": "TOL1", + "name": "TOLDOH21-TOL1" + }, + { + "id": "LON1", + "name": "LONEENCO-LON1" + }, + { + "id": "SJU78", + "name": "SDIT1JUB-SJU78" + }, + { + "id": "STN27", + "name": "HSTNTX01-STN27" + }, + { + "id": "SSW56", + "name": "ss8126GT-SSW56" + }, + { + "id": "SBB78", + "name": "SDIT1BBB-SBB78" + }, + { + "id": "DCC3", + "name": "POIUYTGH-DCC3" + }, + { + "id": "GNV1", + "name": "GNVLSCTL-GNV1" + }, + { + "id": "WAS1", + "name": "WASHDCSW-WAS1" + }, + { + "id": "TOY1", + "name": "TORYONNZ-TOY1" + }, + { + "id": "STT1", + "name": "STTLWA02-STT1" + }, + { + "id": "STG1", + "name": "STTGGE62-STG1" + }, + { + "id": "SLL78", + "name": "SDCTLLL1-SLL78" + }, + { + "id": "SBU78", + "name": "SDIT1BUB-SBU78" + }, + { + "id": "ATL2", + "name": "ATLNGANW-ATL2" + }, + { + "id": "BOT1", + "name": "BOTHWAKY-BOT1" + }, + { + "id": "SNG1", + "name": "SNGPSIAU-SNG1" + }, + { + "id": "NYC1", + "name": "NYCMNY54-NYC1" + }, + { + "id": "LAG1b", + "name": "LARGIZON-LAG1b" + }, + { + "id": "AMD15", + "name": "AMDFAA01-AMD15" + }, + { + "id": "SNA1", + "name": "SNANTXCA-SNA1" + }, + { + "id": "PLT1", + "name": "PLTNCA60-PLT1" + }, + { + "id": "TLP1", + "name": "TLPNXM18-TLP1" + }, + { + "id": "SDD81", + "name": "SAIT1DD6-SDD81" + }, + { + "id": "DCC1", + "name": "POIUYTGH-DCC1" + }, + { + "id": "DCC2", + "name": "POIUYTGH-DCC2" + }, + { + "id": "OKC1", + "name": "OKCBOK55-OKC1" + }, + { + "id": "PAR1", + "name": "PARSFRCG-PAR1" + }, + { + "id": "TES36", + "name": "ABCEETES-TES36" + }, + { + "id": "COM1", + "name": "PLMKOPIU-COM1" + }, + { + "id": "ANI1", + "name": "ATLNGTRE-ANI1" + }, + { + "id": "SDG78", + "name": "SDIT1BDG-SDG78" + }, + { + "id": "mac20", + "name": "PKGTESTF-mac20" + }, + { + "id": "DSF45", + "name": "DSFBG123-DSF45" + }, + { + "id": "HST25", + "name": "HSTNTX01-HST25" + }, + { + "id": "AMD18", + "name": "AUDIMA01-AMD18" + }, + { + "id": "SAA80", + "name": "SAIT9AA3-SAA80" + }, + { + "id": "SSA56", + "name": "SSIT2AA7-SSA56" + }, + { + "id": "SDD82", + "name": "SAIT1DD9-SDD82" + }, + { + "id": "JCV1", + "name": "JCVLFLBW-JCV1" + }, + { + "id": "SUL2", + "name": "WERTYUJK-SUL2" + }, + { + "id": "PUR1", + "name": "purelyde-PUR1" + }, + { + "id": "FDE55", + "name": "FDERT555-FDE55" + }, + { + "id": "SITE", + "name": "LONEENCO-SITE" + }, + { + "id": "ATL1", + "name": "ATLNGAMA-ATL1" + }, + { + "id": "JUL1", + "name": "ZXCVBNMM-JUL1" + }, + { + "id": "TAT34", + "name": "TESAAISB-TAT34" + }, + { + "id": "XCP12", + "name": "CHKGH123-XCP12" + }, + { + "id": "RAI1", + "name": "poiuytre-RAI1" + }, + { + "id": "HPO1", + "name": "ATLNGAUP-HPO1" + }, + { + "id": "KJF12", + "name": "KJFDH123-KJF12" + }, + { + "id": "SCC80", + "name": "SAIT9CC3-SCC80" + }, + { + "id": "SAA12", + "name": "SAIT9AF8-SAA12" + }, + { + "id": "SAA14", + "name": "SAIT1AA9-SAA14" + }, + { + "id": "ATL35", + "name": "TTESSAAI-ATL35" + }, + { + "id": "CWY1", + "name": "CWYMOWBS-CWY1" + }, + { + "id": "ATL76", + "name": "TELEPAAI-ATL76" + }, + { + "id": "DSL12", + "name": "DSLFK242-DSL12" + }, + { + "id": "ATL53", + "name": "AAIATLTE-ATL53" + }, + { + "id": "SAA11", + "name": "SAIT9AA2-SAA11" + }, + { + "id": "ATL62", + "name": "TESSASCH-ATL62" + }, + { + "id": "AUG1", + "name": "ASDFGHJK-AUG1" + }, + { + "id": "POI22", + "name": "POIUY123-POI22" + }, + { + "id": "SAA13", + "name": "SAIT1AA9-SAA13" + }, + { + "id": "BHY17", + "name": "BHYTFRF3-BHY17" + }, + { + "id": "LIS1", + "name": "HOSTPROF-LIS1" + }, + { + "id": "SIP1", + "name": "ZXCVBNMK-SIP1" + }, + { + "id": "ATL99", + "name": "TEESTAAI-ATL43" + }, + { + "id": "ATL64", + "name": "FORLOAAJ-ATL64" + }, + { + "id": "TAT33", + "name": "TESAAISA-TAT33" + }, + { + "id": "RAD10", + "name": "INDIPUNE-RAD10" + }, + { + "id": "RTW5", + "name": "BHYTFRY4-RTW5" + }, + { + "id": "JGS1", + "name": "KSJKKKKK-JGS1" + }, + { + "id": "ATL98", + "name": "TEESTAAI-ATL43" + }, + { + "id": "WAN1", + "name": "LEIWANGW-WAN1" + }, + { + "id": "ATL44", + "name": "ATLSANAB-ATL44" + }, + { + "id": "RTD2", + "name": "BHYTFRk4-RTD2" + }, + { + "id": "NIR1", + "name": "ORFLMANA-NIR1" + }, + { + "id": "ATL75", + "name": "SANAAIRE-ATL75" + }, + { + "id": "NUM1", + "name": "QWERTYUI-NUM1" + }, + { + "id": "MTN32", + "name": "MDTWNJ21-MTN32" + }, + { + "id": "RTZ4", + "name": "BHYTFRZ6-RTZ4" + }, + { + "id": "ATL56", + "name": "ATLSANAC-ATL56" + }, + { + "id": "AMS1", + "name": "AMSTNLBW-AMS1" + }, + { + "id": "RCT1", + "name": "AMSTERNL-RCT1" + }, + { + "id": "JAN1", + "name": "ORFLMATT-JAN1" + }, + { + "id": "ABC14", + "name": "TESAAISA-ABC14" + }, + { + "id": "TAT37", + "name": "TESAAISD-TAT37" + }, + { + "id": "MIC54", + "name": "MICHIGAN-MIC54" + }, + { + "id": "ABC11", + "name": "ATLSANAI-ABC11" + }, + { + "id": "AMF11", + "name": "AMDOCS01-AMF11" + }, + { + "id": "ATL63", + "name": "ATLSANEW-ATL63" + }, + { + "id": "ABC12", + "name": "ATLSECIA-ABC12" + }, + { + "id": "MTN20", + "name": "MDTWNJ21-MTN20" + }, + { + "id": "ABC15", + "name": "AAITESAN-ABC15" + }, + { + "id": "AVT1", + "name": "AVTRFLHD-AVT1" + }, + { + "id": "ATL34", + "name": "ATLSANAI-ATL34" + } + ], + "categoryParameters": { + "owningEntityList": [ + { + "id": "ad5a17e0-4ee1-4287-bdb7-25848042d265", + "name": "046e7910-c114-4198-adb4-3bcd41f78a63" + }, + { + "id": "482de866-5306-4917-a54d-044d3a5cbeae", + "name": "14553d7c-a9ce-427d-b043-2761b2e0b468" + }, + { + "id": "509a94a3-c6b3-4164-aa06-27abed58574e", + "name": "2753cf38-e4c7-4e47-adf8-3d0a5d897352" + }, + { + "id": "dd7cb3b5-ed8f-4261-9f2e-5e88e5a0b54e", + "name": "2e544d86-b1f9-4d44-8a78-16ea16ca9bf4" + }, + { + "id": "fefb7398-36d2-4860-887b-4d8745ec7e88", + "name": "7f49941a-4f6b-4184-8139-1f46464361f8" + }, + { + "id": "5a8de060-efdc-4793-a506-115fed2ac9ef", + "name": "88f08647-8abc-4d86-894d-ccdd8cabd8cf" + }, + { + "id": "f2c501d8-4e22-43cf-be58-83a925c2fc70", + "name": "a6f81e25-8b4c-4f82-9d1d-bf09ef8ca2ea" + }, + { + "id": "aaa1", + "name": "aaa1" + }, + { + "id": "1d67282c-e51f-4bfe-afa0-ae0d9081d1fc", + "name": "af2c6ca4-665e-4263-b78d-86ede27d452c" + }, + { + "id": "840a8a2a-9bf2-40c5-af8f-015d62cf5250", + "name": "c214ad5a-34e7-49ed-b7a9-aa9f9546a2d3" + }, + { + "id": "d093cd6f-73b8-4750-968a-c93e7567af66", + "name": "caa6e570-b1ee-4620-bdfd-dc7bb5aedcb1" + }, + { + "id": "f85da3ed-669f-424d-8e05-b71149519643", + "name": "f05eaa46-7ce5-4610-93b4-928199b97b5b" + }, + { + "id": "970ef4d5-d5f4-4992-b7a1-98dfc4de73fb", + "name": "fd160c26-c5d3-4623-8f6a-2028509029cc" + }, + { + "id": "d61e6f2d-12fa-4cc2-91df-7c244011d6fc", + "name": "WayneHolland" + }, + { + "id": "Melissa", + "name": "Melissa" + } + ], + "projectList": [ + { + "id": "WATKINS", + "name": "WATKINS" + }, + { + "id": "x1", + "name": "x1" + }, + { + "id": "yyy1", + "name": "yyy1" + } + ], + "lineOfBusinessList": [ + { + "id": "ONAP", + "name": "ONAP" + }, + { + "id": "zzz1", + "name": "zzz1" + } + ], + "platformList": [ + { + "id": "platform", + "name": "platform" + }, + { + "id": "xxx1", + "name": "xxx1" + } + ] + }, + "type": "UPDATE_LCP_REGIONS_AND_TENANTS" + }, + "global": { + "name": null + } +} diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/permission.mock.ts b/vid-webpack-master/cypress/support/jsonBuilders/mocks/permission.mock.ts new file mode 100644 index 000000000..a69d72566 --- /dev/null +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/permission.mock.ts @@ -0,0 +1,29 @@ +declare namespace Cypress { + interface Chainable { + permissionVidMock: typeof permissionVidMock; + initDrawingBoardUserPermission : typeof initDrawingBoardUserPermission; + } +} + + + +function initDrawingBoardUserPermission( response?: any , delay?: number, status?: number) : void { + cy.server() + .route({ + method: 'GET', + delay : delay ? delay : 0, + status : status ? status : 200, + url : Cypress.config('baseUrl') + "/roles/service_permissions?**", + response : response ? response : { + isEditPermitted : true + } + }).as('isEditPermitted'); +} + +function permissionVidMock(): void { + initDrawingBoardUserPermission(); +} + + +Cypress.Commands.add('permissionVidMock', permissionVidMock); +Cypress.Commands.add('initDrawingBoardUserPermission', initDrawingBoardUserPermission); diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/vid.mock.ts b/vid-webpack-master/cypress/support/jsonBuilders/mocks/vid.mock.ts index 5bc02d1c2..8b25488b6 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/vid.mock.ts +++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/vid.mock.ts @@ -3,6 +3,9 @@ declare namespace Cypress { initVidMock: typeof initVidMock; preventErrorsOnLoading : typeof preventErrorsOnLoading; initCategoryParameter : typeof initCategoryParameter; + initAuditInfoMSO: typeof initAuditInfoMSO; + initAuditInfoMSOALaCarte: typeof initAuditInfoMSOALaCarte; + initAsyncInstantiation : typeof initAsyncInstantiation; } } @@ -34,7 +37,7 @@ function initCategoryParameter(response? : JSON) : void { status : 200, url : Cypress.config('baseUrl') + "/category_parameter**", response : response ? response : res - }); + }).as('initCategoryParameters'); }) } @@ -77,6 +80,34 @@ function initAuditInfoMSO(response? : JSON, delay?: number, status?: number) : v }) } +function initAuditInfoMSOALaCarte(response? : JSON, delay?: number, status?: number) : void { + cy.readFile('../vid-automation/src/test/resources/a-la-carte/auditInfoMSOALaCarte.json').then((res) => { + cy.server() + .route({ + method: 'GET', + delay : delay ? delay : 0, + status : status ? status : 200, + url : Cypress.config('baseUrl') + "/asyncInstantiation/auditStatus/**/mso**", + response : response ? response : res + }).as('initAuditInfoMSOAlaCarte'); + }) +} + +function initAsyncInstantiation(response? : JSON, delay?: number, status?: number) : void { + cy.readFile('/cypress/support/jsonBuilders/mocks/jsons/basicAsyncInstantiation.json').then((res) => { + cy.server() + .route({ + method: 'GET', + delay : delay ? delay : 0, + status : status ? status : 200, + url : Cypress.config('baseUrl') + "/asyncInstantiation", + response : response ? response : res + }).as('initAsyncInstantiation'); + }) +} + + + function initVidMock(): void { initGetToMenuInfo(); initCategoryParameter(); @@ -89,3 +120,6 @@ function initVidMock(): void { Cypress.Commands.add('initVidMock', initVidMock); Cypress.Commands.add('preventErrorsOnLoading', preventErrorsOnLoading); Cypress.Commands.add('initCategoryParameter', initCategoryParameter); +Cypress.Commands.add('initAuditInfoMSO', initAuditInfoMSO); +Cypress.Commands.add('initAuditInfoMSOALaCarte', initAuditInfoMSOALaCarte); +Cypress.Commands.add('initAsyncInstantiation', initAsyncInstantiation); diff --git a/vid-webpack-master/cypress/support/jsonBuilders/models/asyncInstantiation.model.ts b/vid-webpack-master/cypress/support/jsonBuilders/models/asyncInstantiation.model.ts index fa394360c..796a914a1 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/models/asyncInstantiation.model.ts +++ b/vid-webpack-master/cypress/support/jsonBuilders/models/asyncInstantiation.model.ts @@ -33,4 +33,41 @@ export class AsyncInstantiationModel{ serviceModelName: string; serviceModelVersion: string; createdBulkDate: number; + action: string; + + constructor(){ + this.id = 0; + this.created = 0; + this.modified= 0; + this.createdId = ''; + this.modifiedId = ''; + this.rowNum = ''; + this.auditUserId = ''; + this.auditTrail = ''; + this.jobId = ''; + this.templateId = ''; + this.userId = ''; + this.jobStatus = ''; + this.statusModifiedDate= 0 ; + this.hidden = false; + this.pause= false; + this.owningEntityId= ''; + this.owningEntityName= ''; + this.project= ''; + this.aicZoneId= ''; + this.aicZoneName= ''; + this.tenantId= ''; + this.tenantName= ''; + this.regionId= ''; + this.regionName= ''; + this.serviceType= ''; + this.subscriberName= ''; + this.serviceInstanceId = 0; + this.serviceInstanceName= ''; + this.serviceModelId= ''; + this.serviceModelName= ''; + this.serviceModelVersion= ''; + this.createdBulkDate= 0; + this.action = ''; + } } diff --git a/vid-webpack-master/cypress/support/jsonBuilders/models/service.model.ts b/vid-webpack-master/cypress/support/jsonBuilders/models/service.model.ts index af12dfbeb..3c67112cb 100644 --- a/vid-webpack-master/cypress/support/jsonBuilders/models/service.model.ts +++ b/vid-webpack-master/cypress/support/jsonBuilders/models/service.model.ts @@ -23,5 +23,19 @@ export class ServiceModel{ vfModules: Object; volumeGroups: Object; pnfs:Object; + vnfGroups: Object; + + constructor(){ + this.service = <any>{}; + this.vnfs = {}; + this.networks= {}; + this.collectionResource = {}; + this.configurations = {}; + this.serviceProxies = {}; + this.vfModules = {}; + this.volumeGroups = {}; + this.pnfs = {}; + this.vnfGroups = {}; + } } diff --git a/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardComponentInfo.steps.ts b/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardComponentInfo.steps.ts new file mode 100644 index 000000000..2033f060c --- /dev/null +++ b/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardComponentInfo.steps.ts @@ -0,0 +1,22 @@ +declare namespace Cypress { + interface Chainable { + assertComponentInfoTitleLabelsAndValues: typeof assertComponentInfoTitleLabelsAndValues + } +} + + + +function assertComponentInfoTitleLabelsAndValues(expectedTitle: string, labelsAndValues: string[][]) : void{ + cy.getElementByDataTestsId('component-info-section-title').should('have.text', expectedTitle); + labelsAndValues.forEach((tuple: string[], index: number, array: string[][]) => { + let label = tuple[0]; + let value = tuple[1]; + cy.getElementByDataTestsId('model-item-label-' + label).should('have.text', label); + cy.getElementByDataTestsId('model-item-value-' + label).should('have.text', value); + }); +} + + + + +Cypress.Commands.add('assertComponentInfoTitleLabelsAndValues', assertComponentInfoTitleLabelsAndValues); diff --git a/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardModel.steps.ts b/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardModel.steps.ts new file mode 100644 index 000000000..b2b48b268 --- /dev/null +++ b/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardModel.steps.ts @@ -0,0 +1,17 @@ +declare namespace Cypress { + interface Chainable { + drawingBoardPressAddButtonByElementName: typeof drawingBoardPressAddButtonByElementName, + drawingBoardNumberOfExistingElementsShouldContains: typeof drawingBoardNumberOfExistingElementsShouldContains + } +} + +function drawingBoardPressAddButtonByElementName(elementName : string) : Chainable<any> { + return cy.getElementByDataTestsId(elementName + '-add-btn'); +} + +function drawingBoardNumberOfExistingElementsShouldContains(expectedElements : number) : void { + cy.getElementByDataTestsId('numberButton').contains(expectedElements); +} + +Cypress.Commands.add('drawingBoardPressAddButtonByElementName', drawingBoardPressAddButtonByElementName); +Cypress.Commands.add('drawingBoardNumberOfExistingElementsShouldContains', drawingBoardNumberOfExistingElementsShouldContains); diff --git a/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardTree.steps.ts b/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardTree.steps.ts new file mode 100644 index 000000000..0150b44aa --- /dev/null +++ b/vid-webpack-master/cypress/support/steps/drawingBoard/drawingBoardTree.steps.ts @@ -0,0 +1,27 @@ +declare namespace Cypress { + interface Chainable { + drawingBoardTreeOpenContextMenuByElementDataTestId: typeof drawingBoardTreeOpenContextMenuByElementDataTestId, + drawingBoardTreeClickOnContextMenuOptionByName: typeof drawingBoardTreeClickOnContextMenuOptionByName + } +} + +function drawingBoardTreeOpenContextMenuByElementDataTestId(dataTestId : string, index ?: number) : Chainable<any> { + return cy.getElementByDataTestsId(dataTestId + "-menu-btn").eq(index != null ? index : 0).click({force: true}); +} + +function drawingBoardTreeClickOnContextMenuOptionByName(optionName : string) : Chainable<any> { + switch (optionName) { + case 'Duplicate': + return cy.getElementByDataTestsId('context-menu-duplicate').click({force : true}); + case 'Remove': + return cy.getElementByDataTestsId('context-menu-remove').click({force : true}); + case 'Edit': + return cy.getElementByDataTestsId('context-menu-edit').click({force : true}); + default: + return cy.getElementByDataTestsId('context-menu-duplicate').click({force : true}); + } +} + + +Cypress.Commands.add('drawingBoardTreeOpenContextMenuByElementDataTestId', drawingBoardTreeOpenContextMenuByElementDataTestId); +Cypress.Commands.add('drawingBoardTreeClickOnContextMenuOptionByName', drawingBoardTreeClickOnContextMenuOptionByName); diff --git a/vid-webpack-master/cypress/support/steps/drawingBoard/general.steps.ts b/vid-webpack-master/cypress/support/steps/drawingBoard/general.steps.ts new file mode 100644 index 000000000..5444971b7 --- /dev/null +++ b/vid-webpack-master/cypress/support/steps/drawingBoard/general.steps.ts @@ -0,0 +1,33 @@ +declare namespace Cypress { + interface Chainable { + updateServiceShouldNotOverrideChild: typeof updateServiceShouldNotOverrideChild + openServiceContextMenu: typeof openServiceContextMenu + } +} + +function updateServiceShouldNotOverrideChild() : void { + cy.getElementByDataTestsId('drawing-board-tree').find('.node-content-wrapper').then((elements)=>{ + let numberOfExistingElements = elements.length; + cy.openServiceContextMenu().then(() =>{ + cy.getElementByDataTestsId('context-menu-header-edit-item').click({force : true}).then(()=>{ + cy.genericFormSubmitForm().then(()=>{ + cy.getElementByDataTestsId('drawing-board-tree').find('.node-content-wrapper').then((afterUpdateServiceElements)=>{ + chai.expect(numberOfExistingElements).equal(afterUpdateServiceElements.length); + }); + }); + }); + }); + }); + +} + + +function openServiceContextMenu() : Chainable<any> { + return cy.getElementByDataTestsId('openMenuBtn').click({force: true}); +} + + + + +Cypress.Commands.add('updateServiceShouldNotOverrideChild', updateServiceShouldNotOverrideChild); +Cypress.Commands.add('openServiceContextMenu', openServiceContextMenu); diff --git a/vid-webpack-master/cypress/support/steps/fill.network.step.ts b/vid-webpack-master/cypress/support/steps/fill.network.step.ts new file mode 100644 index 000000000..c981ac4b2 --- /dev/null +++ b/vid-webpack-master/cypress/support/steps/fill.network.step.ts @@ -0,0 +1,19 @@ +// add new command to the existing Cypress interface +declare namespace Cypress { + interface Chainable { + fillNetworkPopup: typeof fillNetworkPopup, + } +} + +function fillNetworkPopup(): Chainable<any> { + cy.selectDropdownOptionByText('productFamily', 'Emanuel'); + cy.selectDropdownOptionByText('lcpRegion', 'hvf6'); + cy.selectDropdownOptionByText('tenant', 'AIN Web Tool-15-D-STTest2'); + cy.selectDropdownOptionByText('lineOfBusiness', 'zzz1'); + cy.selectDropdownOptionByText('platform', 'xxx1'); + return cy.getElementByDataTestsId('form-set').click({force : true}).then((done)=>{ + return done; + }); +} + +Cypress.Commands.add('fillNetworkPopup', fillNetworkPopup); diff --git a/vid-webpack-master/cypress/support/steps/fill.service.popup.step.ts b/vid-webpack-master/cypress/support/steps/fill.service.popup.step.ts new file mode 100644 index 000000000..4595d89fc --- /dev/null +++ b/vid-webpack-master/cypress/support/steps/fill.service.popup.step.ts @@ -0,0 +1,25 @@ + +declare namespace Cypress { + interface Chainable { + fillServicePopup: typeof FillServicePopup + } +} + +function FillServicePopup(): Chainable<any> { + cy.openIframe('/app/ui/#/servicePopup?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd&isCreate=true'); + cy.selectDropdownOptionByText('subscriberName', 'SILVIA ROBBINS'); + cy.selectDropdownOptionByText('serviceType', 'TYLER SILVIA'); + cy.selectDropdownOptionByText('productFamily', 'TYLER SILVIA'); + cy.selectDropdownOptionByText('lcpRegion', 'hvf6'); + cy.selectDropdownOptionByText('tenant', 'AIN Web Tool-15-D-testalexandria'); + cy.selectDropdownOptionByText('aic_zone', 'NFTJSSSS-NFT1'); + cy.selectDropdownOptionByText('project', 'WATKINS'); + cy.selectDropdownOptionByText('owningEntity', 'aaa1'); + cy.selectDropdownOptionByText('rollback', 'Rollback'); + return cy.getElementByDataTestsId('form-set').click({force : true}).then((done)=>{ + return done; + }); + +} + +Cypress.Commands.add('fillServicePopup', FillServicePopup); diff --git a/vid-webpack-master/cypress/support/steps/fill.vfModule.step.ts b/vid-webpack-master/cypress/support/steps/fill.vfModule.step.ts new file mode 100644 index 000000000..d2977832d --- /dev/null +++ b/vid-webpack-master/cypress/support/steps/fill.vfModule.step.ts @@ -0,0 +1,24 @@ +declare namespace Cypress { + interface Chainable { + fillVFModulePopup: typeof FillVFModulePopup + } +} + +function FillVFModulePopup(vnfName: string, vfModuleName: string, instanceName: string, lcpRegion: string, tenant: string, rollback: boolean, sdncPreLoad: boolean): Chainable<any> { + cy.getElementByDataTestsId('node-' + vnfName).click({force: true}); + cy.getElementByDataTestsId('node-' + vfModuleName + '-add-btn').click({force: true}); + cy.getElementByDataTestsId('instanceName').last().type(instanceName, {force: true}); + cy.getElementByDataTestsId('lcpRegion').last().select(lcpRegion); + cy.getElementByDataTestsId('tenant').last().select(tenant); + cy.getElementByDataTestsId('lcpRegion').last().select(lcpRegion); + cy.getElementByDataTestsId('rollback').last().select(String(rollback)); + if (sdncPreLoad) { + cy.getElementByDataTestsId('sdncPreLoad').last().check(); + } + return cy.getElementByDataTestsId('form-set').last().click({force: true}).then((done) => { + return done; + }); + +} + +Cypress.Commands.add('fillVFModulePopup', FillVFModulePopup); diff --git a/vid-webpack-master/cypress/support/steps/fill.vnf.popup.step.ts b/vid-webpack-master/cypress/support/steps/fill.vnf.popup.step.ts new file mode 100644 index 000000000..a5319b80f --- /dev/null +++ b/vid-webpack-master/cypress/support/steps/fill.vnf.popup.step.ts @@ -0,0 +1,30 @@ +// add new command to the existing Cypress interface + + +declare namespace Cypress { + interface Chainable { + fillVnfPopup: typeof FillVnfPopup, + duplicateVnf: typeof DuplicateVnf, + } +} +function FillVnfPopup(): Chainable<any> { + cy.selectDropdownOptionByText('productFamily', 'Emanuel'); + cy.selectDropdownOptionByText('lcpRegion', 'hvf6'); + cy.selectDropdownOptionByText('tenant', 'AIN Web Tool-15-D-STTest2'); + cy.selectDropdownOptionByText('lineOfBusiness', 'zzz1'); + cy.selectDropdownOptionByText('platform', 'xxx1'); + return cy.getElementByDataTestsId('form-set').click({force : true}).then((done)=>{ + return done; + }); +} +function DuplicateVnf( vnfNode: string, amountBefore: number): Chainable<any> { + return cy.getElementByDataTestsId(vnfNode).should('have.length', amountBefore) + .getElementByDataTestsId(vnfNode+"-menu-btn").click({force:true}) + .getElementByDataTestsId('context-menu-duplicate').click({force : true}) + .getTagElementContainsText('button','Duplicate').click({force:true}) + .getElementByDataTestsId(vnfNode).should('have.length', amountBefore+1).then((done)=>{ + return done; + }); +} +Cypress.Commands.add('fillVnfPopup', FillVnfPopup); +Cypress.Commands.add('duplicateVnf', DuplicateVnf); diff --git a/vid-webpack-master/cypress/support/steps/general/clickOutside.step.ts b/vid-webpack-master/cypress/support/steps/general/clickOutside.step.ts new file mode 100644 index 000000000..e3323a125 --- /dev/null +++ b/vid-webpack-master/cypress/support/steps/general/clickOutside.step.ts @@ -0,0 +1,14 @@ +declare namespace Cypress { + interface Chainable { + clickOutside: typeof clickOutside, + } +} + +function clickOutside(testByIdClickElement : string, testBeforeClickOutside : Function, testAfterClickOutside : Function) { + testBeforeClickOutside(); + cy.getElementByDataTestsId(testByIdClickElement).click({force: true}).then(()=>{ + testAfterClickOutside(); + }); +} + +Cypress.Commands.add('clickOutside', clickOutside); diff --git a/vid-webpack-master/cypress/support/steps/general/compareDeepObjects.step.ts b/vid-webpack-master/cypress/support/steps/general/compareDeepObjects.step.ts new file mode 100644 index 000000000..ee5e95a3a --- /dev/null +++ b/vid-webpack-master/cypress/support/steps/general/compareDeepObjects.step.ts @@ -0,0 +1,32 @@ +const { _ } = Cypress; + +declare namespace Cypress { + interface Chainable { + deepCompare: typeof deepCompare, + } +} + +function deepCompare(actual : any, expected : any) { + if(actual !== null && expected !== null){ + let diff : any[] = []; + Cypress._.mergeWith(actual, expected, function (objectValue, sourceValue, key, object, source) { + if ( !(_.isEqual(objectValue, sourceValue)) && (Object(objectValue) !== objectValue)) { + diff.push("key: " +key + ", expected: " + sourceValue + ", actual: " + objectValue); + } + }); + + Cypress._.mergeWith(expected, actual, function (objectValue, sourceValue, key, object, source) { + if ( !(_.isEqual(objectValue, sourceValue)) && (Object(objectValue) !== objectValue)) { + diff.push("key: " +key + ", expected: " + sourceValue + ", actual: " + objectValue); + } + }); + + if(diff.length > 0){ + console.error("diff", diff); + cy.log("The object are not equals", diff); + expect(actual).equals(expected); + } + } +} + +Cypress.Commands.add('deepCompare', deepCompare); diff --git a/vid-webpack-master/cypress/support/steps/genericForm/checkPopover.step.ts b/vid-webpack-master/cypress/support/steps/genericForm/checkPopover.step.ts new file mode 100644 index 000000000..085410ece --- /dev/null +++ b/vid-webpack-master/cypress/support/steps/genericForm/checkPopover.step.ts @@ -0,0 +1,14 @@ +declare namespace Cypress { + interface Chainable { + checkPopoverContentOnMouseEvent: typeof checkPopoverContentOnMouseEvent + } +} + +function checkPopoverContentOnMouseEvent(dataTestId: string, klass: string, mouseEvent: string, index: number) : Chainable<any> { + index = index || 0; + let element = cy.getElementByDataTestsId(dataTestId).eq(index); + element.trigger(mouseEvent).click().get(klass); + return element; +} + +Cypress.Commands.add('checkPopoverContentOnMouseEvent', checkPopoverContentOnMouseEvent); diff --git a/vid-webpack-master/cypress/support/steps/genericForm/genericFormAction.steps.ts b/vid-webpack-master/cypress/support/steps/genericForm/genericFormAction.steps.ts new file mode 100644 index 000000000..9786369cf --- /dev/null +++ b/vid-webpack-master/cypress/support/steps/genericForm/genericFormAction.steps.ts @@ -0,0 +1,12 @@ +declare namespace Cypress { + interface Chainable { + genericFormSubmitForm: typeof genericFormSubmitForm + } +} + +function genericFormSubmitForm() : Chainable<any> { + return cy.getElementByDataTestsId('form-set').click({force: true}); +} + + +Cypress.Commands.add('genericFormSubmitForm', genericFormSubmitForm); diff --git a/vid-webpack-master/cypress/support/steps/login.step.ts b/vid-webpack-master/cypress/support/steps/login.step.ts index f35e6e6b8..a7ed0752e 100644 --- a/vid-webpack-master/cypress/support/steps/login.step.ts +++ b/vid-webpack-master/cypress/support/steps/login.step.ts @@ -32,7 +32,6 @@ function login(): void { currentLoginCookies = res; }); } - } function openIframe(iframeUrl : string): void { diff --git a/vid-webpack-master/cypress/support/steps/menu.step.ts b/vid-webpack-master/cypress/support/steps/menu.step.ts new file mode 100644 index 000000000..a0bfdb6b3 --- /dev/null +++ b/vid-webpack-master/cypress/support/steps/menu.step.ts @@ -0,0 +1,19 @@ +declare namespace Cypress { + interface Chainable { + assertMenuItemsForNode: typeof assertMenuItemsForNode + } +} + function assertMenuItemsForNode(enabledActions: string[], nodeName: string, index: number = 0) : Chainable<any> { + let node = cy.getElementByDataTestsId(nodeName).eq(+index); + node.trigger('mouseover').click().then(()=> { + + //waiting to the menu to appear to catch options that shall not exist but actually exist + cy.get('.ngx-contextmenu').should('exist').then(()=> { + for (let option of ['duplicate', 'showAuditInfo', 'addGroupMember', 'delete', 'undoDelete', 'remove', ...enabledActions]) { + cy.getElementByDataTestsId(`context-menu-${option}`).should(enabledActions.some(s => s === option) ? 'exist' : 'not.exist'); + }}); + }); + return node; +} + +Cypress.Commands.add('assertMenuItemsForNode', assertMenuItemsForNode); diff --git a/vid-webpack-master/cypress/support/steps/openInstanceAuditInfoModal.step.ts b/vid-webpack-master/cypress/support/steps/openInstanceAuditInfoModal.step.ts new file mode 100644 index 000000000..7fc50c111 --- /dev/null +++ b/vid-webpack-master/cypress/support/steps/openInstanceAuditInfoModal.step.ts @@ -0,0 +1,18 @@ +declare namespace Cypress { + interface Chainable { + openInstanceAuditInfoModal: typeof openInstanceAuditInfoModal, + } +} + +function openInstanceAuditInfoModal(iconTextId: string): void { + cy.getElementByDataTestsId(iconTextId).click({force: true}) + .getElementByDataTestsId('context-menu-showAuditInfo').click({force : true}) + .getElementByDataTestsId('audit-info-title').contains('Instantiation Information'); + cy.get('.table-title').contains('MSO status'); + cy.get('#cancelButton').click({force: true}) + +} + + +Cypress.Commands.add('openInstanceAuditInfoModal', openInstanceAuditInfoModal); + |