summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--vid-automation/src/test/resources/vrf/vrfServiceCreateRequest.json16
-rw-r--r--vid-webpack-master/cypress/integration/iFrames/collectionResource.e2e.ts4
-rw-r--r--vid-webpack-master/cypress/integration/iFrames/vrf.e2e.ts42
3 files changed, 31 insertions, 31 deletions
diff --git a/vid-automation/src/test/resources/vrf/vrfServiceCreateRequest.json b/vid-automation/src/test/resources/vrf/vrfServiceCreateRequest.json
index 2d7121729..9df587afb 100644
--- a/vid-automation/src/test/resources/vrf/vrfServiceCreateRequest.json
+++ b/vid-automation/src/test/resources/vrf/vrfServiceCreateRequest.json
@@ -12,12 +12,12 @@
"provStatus": null,
"inMaint": false,
"modelInfo": {
- "modelInvariantId": "vnf-instance-model-invariant-id",
- "modelVersionId": "vnf-instance-model-version-id",
- "modelCustomizationId": "vnf-instance-model-customization-id",
+ "modelInvariantId": "b67a289b-1688-496d-86e8-1583c828be0a",
+ "modelVersionId": "9cac02be-2489-4374-888d-2863b4511a59",
+ "modelCustomizationId": "dd024d73-9bd1-425d-9db5-476338d53433",
"modelType": "vrf"
},
- "uuid": "vnf-instance-model-version-id",
+ "uuid": "9cac02be-2489-4374-888d-2863b4511a59",
"productFamilyId": null,
"lcpCloudRegionId": "olson3",
"cloudOwner": "att-nc",
@@ -65,13 +65,13 @@
"provStatus": "prov",
"inMaint": false,
"modelInfo": {
- "modelInvariantId": "network-instance-model-invariant-id",
- "modelVersionId": "network-instance-model-version-id",
- "modelCustomizationId": "network-instance-model-customization-id",
+ "modelInvariantId": "vpn-instance-model-invariant-id",
+ "modelVersionId": "vpn-model-version-id",
+ "modelCustomizationId": "vpn-instance-model-customization-id",
"modelName": "modelName",
"modelType": "vpnBinding"
},
- "uuid": "network-instance-model-version-id",
+ "uuid": "vpn-model-version-id",
"productFamilyId": null,
"lcpCloudRegionId": null,
"legacyRegion": null,
diff --git a/vid-webpack-master/cypress/integration/iFrames/collectionResource.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/collectionResource.e2e.ts
index 55c43d01b..1a925b3d8 100644
--- a/vid-webpack-master/cypress/integration/iFrames/collectionResource.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/collectionResource.e2e.ts
@@ -108,7 +108,7 @@ describe('Drawing board : Collection resource', function () {
'node-type-indicator': 'CR',
'node-name': 'NcmVlanSvcYm161f_77_vTSBC Customer Landing Network Collection'
},
- 'node-undefined-undefined': {
+ 'node-dd182d7d-6949-4b90-b3cc-5befe400742e-undefined': {
'node-type-indicator': 'NCF',
'node-name': 'NcmVlanSvcYm161f_77_vTSBC Customer Landing Network Collection'
}
@@ -123,7 +123,7 @@ describe('Drawing board : Collection resource', function () {
],
title: "Collection Resource Instance INFO"
},
- 'node-undefined-undefined': {
+ 'node-dd182d7d-6949-4b90-b3cc-5befe400742e-undefined': {
labelsAndValues: [
['Model version', "1"],
['Instance ID', '6b3536cf-3a12-457f-abb5-fa2203e0d923'],
diff --git a/vid-webpack-master/cypress/integration/iFrames/vrf.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/vrf.e2e.ts
index 529d96a3b..a589f1c87 100644
--- a/vid-webpack-master/cypress/integration/iFrames/vrf.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/vrf.e2e.ts
@@ -45,13 +45,13 @@ describe('Drawing board : VRF', function () {
'node-type-indicator': 'VRF',
'node-name': '<Automatically Assigned>'
},
- 'node-undefined-undefined:0': {
+ 'node-network-instance-model-version-id-undefined:0': {
'node-type-indicator': 'N',
'node-name': 'NETWORK1_INSTANCE_NAME',
'status-property-orchStatus': 'Assigned',
'status-property-provStatus': 'prov'
},
- 'node-undefined-undefined:1': {
+ 'node-vpn-model-version-id-undefined:0': {
'node-type-indicator': 'VPN',
'node-name': 'VPN1_INSTANCE_NAME',
'status-property-orchStatus': 'Assigned',
@@ -142,15 +142,15 @@ describe('Drawing board : VRF', function () {
cy.get('#VRF').should('have.length', 1);
cy.get('#VRF .icon-browse').click({force: true}).then(() => {
cy.getElementByDataTestsId('context-menu-changeAssociations').click(); // click on change associations
- cy.getElementByDataTestsId(oldNETWORKDataTestId).get('input').should('be.checked'); // check if selected network is checked.
- cy.getElementByDataTestsId('setMembersBtn').click({force: true}).then(() => { // click 'NEXT' (set network)
- cy.getElementByDataTestsId(oldVPNDataTestId).get('input').should('be.checked'); // check if selected VPN is checked
+ cy.log("check if selected network is checked").getElementByDataTestsId(oldNETWORKDataTestId).get('input').should('be.checked');
+ cy.log("click 'NEXT' (set network)").getElementByDataTestsId('setMembersBtn').click({force: true}).then(() => {
+ cy.log("check if selected VPN is checked").getElementByDataTestsId(oldVPNDataTestId).get('input').should('be.checked');
- cy.get(".sdcCheckboxMember[data-tests-id='" + newVPNDataTestId + "'] input").check({force: true}).then(() => { // select other VPN
+ cy.log("select other VPN").get(".sdcCheckboxMember[data-tests-id='" + newVPNDataTestId + "'] input").check({force: true}).then(() => {
cy.getElementByDataTestsId('cancelBtn').click().then(() => {
- cy.get(".sdcCheckboxMember[data-tests-id='" + newNETWORKDataTestId + "'] input").check({force: true}).then(() => { // select other VPN
+ cy.log("select other network").get(".sdcCheckboxMember[data-tests-id='" + newNETWORKDataTestId + "'] input").check({force: true}).then(() => {
cy.getElementByDataTestsId('setMembersBtn').click();
- cy.get(".sdcCheckboxMember[data-tests-id='" + newVPNDataTestId + "'] input")
+ cy.log("VPN selection exists").get(".sdcCheckboxMember[data-tests-id='" + newVPNDataTestId + "'] input");
cy.getElementByDataTestsId('setMembersBtn').click();
checkSelectedRows(newNETWORKDataTestId, newVPNDataTestId);
@@ -208,7 +208,7 @@ describe('Drawing board : VRF', function () {
configServiceTreeWithMultipleChildren_serviceModel(SERVICE_MODEL_ID);
cy.openIframe(`app/ui/#/servicePlanning/EDIT?serviceModelId=${SERVICE_MODEL_ID}&subscriberId=${SUBSCRIBER_ID}&serviceType=${SERVICE_TYPE}&serviceInstanceId=${SERVICE_INSTANCE_ID}`);
- cy.getElementByDataTestsId("node-undefined-undefined").eq(1).click();
+ cy.getElementByDataTestsId("node-vpn-model-version-id-undefined").eq(0).click();
cy.getElementByDataTestsId("model-item-value-Route target id").should("have.text","mock-global-1");
cy.getElementByDataTestsId("model-item-value-Route target role").should("have.text","mock-role-x");
cy.getElementByDataTestsId("model-item-value-Customet VPN ID").should("have.text","VPN1260");
@@ -228,7 +228,7 @@ describe('Drawing board : VRF', function () {
configServiceTreeWithMultipleChildren_serviceModel(SERVICE_MODEL_ID);
cy.openIframe(`app/ui/#/servicePlanning/EDIT?serviceModelId=${SERVICE_MODEL_ID}&subscriberId=${SUBSCRIBER_ID}&serviceType=${SERVICE_TYPE}&serviceInstanceId=${SERVICE_INSTANCE_ID}`);
- cy.getElementByDataTestsId("node-undefined-undefined").eq(0).click();
+ cy.getElementByDataTestsId("node-network-instance-model-version-id-undefined").eq(0).click();
cy.getElementByDataTestsId("model-item-value-Route target id").should("have.text","mock-global-1");
cy.getElementByDataTestsId("model-item-value-Route target role").should("have.text","mock-role-x");
});
@@ -278,9 +278,9 @@ describe('Drawing board : VRF', function () {
function checkSelectedRows(networkFataTestId: string, vpnDataTestId: string) {
cy.get('#VRF .icon-browse').click({force: true}).then(() => {
cy.getElementByDataTestsId('context-menu-changeAssociations').click(); // click on change associations
- cy.getElementByDataTestsId(networkFataTestId).get('input').should('be.checked'); // check if selected network is checked.
- cy.getElementByDataTestsId('setMembersBtn').click({force: true}).then(() => { // click 'NEXT' (set network)
- cy.getElementByDataTestsId(vpnDataTestId).get('input').should('be.checked'); // check if selected VPN is checked
+ cy.log("check if selected network is checked").getElementByDataTestsId(networkFataTestId).get('input').should('be.checked');
+ cy.log("click 'NEXT' (set network)").getElementByDataTestsId('setMembersBtn').click({force: true}).then(() => {
+ cy.log("check if selected VPN is checked").getElementByDataTestsId(vpnDataTestId).get('input').should('be.checked');
cy.getElementByDataTestsId('setMembersBtn').click();
cy.getElementByDataTestsId('setMembersBtn').click();
});
@@ -384,12 +384,12 @@ describe('Drawing board : VRF', function () {
"provStatus": null,
"inMaint": false,
"modelInfo": {
- "modelInvariantId": "vnf-instance-model-invariant-id",
- "modelVersionId": "vnf-instance-model-version-id",
- "modelCustomizationId": "vnf-instance-model-customization-id",
+ "modelInvariantId": "b67a289b-1688-496d-86e8-1583c828be0a",
+ "modelVersionId": "9cac02be-2489-4374-888d-2863b4511a59",
+ "modelCustomizationId": "dd024d73-9bd1-425d-9db5-476338d53433",
"modelType": "vrf"
},
- "uuid": "vnf-instance-model-version-id",
+ "uuid": "9cac02be-2489-4374-888d-2863b4511a59",
"productFamilyId": null,
"lcpCloudRegionId": "olson3",
"cloudOwner": "att-nc",
@@ -437,13 +437,13 @@ describe('Drawing board : VRF', function () {
"provStatus": "prov",
"inMaint": false,
"modelInfo": {
- "modelInvariantId": "network-instance-model-invariant-id",
- "modelVersionId": "network-instance-model-version-id",
- "modelCustomizationId": "network-instance-model-customization-id",
+ "modelInvariantId": "vpn-instance-model-invariant-id",
+ "modelVersionId": "vpn-model-version-id",
+ "modelCustomizationId": "vpn-instance-model-customization-id",
"modelName": "modelName",
"modelType": "vpnBinding"
},
- "uuid": "network-instance-model-version-id",
+ "uuid": "vpn-model-version-id",
"productFamilyId": null,
"lcpCloudRegionId": null,
"legacyRegion": null,