summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2020-02-10 15:07:40 +0000
committerGerrit Code Review <gerrit@onap.org>2020-02-10 15:07:40 +0000
commited2e7ffe755c1a33d678043b9d5bb4d4290a7e48 (patch)
tree1f2f33e907b6fe4159523184502966b84678af6c
parent9d4ddaa11bf071ff359829856d0bf04e3c25139e (diff)
parent38629dc18f2d352fff194f5830e2f32e5a175987 (diff)
Merge "Remove tenant and lcpCloudRegionId - adjust instantiation-templates.e2e.ts"
-rw-r--r--vid-automation/src/test/resources/asyncInstantiation/templates__instance_from_template__set_without_modify1.json2
-rw-r--r--vid-automation/src/test/resources/asyncInstantiation/templates__instance_template.json2
-rw-r--r--vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts8
3 files changed, 0 insertions, 12 deletions
diff --git a/vid-automation/src/test/resources/asyncInstantiation/templates__instance_from_template__set_without_modify1.json b/vid-automation/src/test/resources/asyncInstantiation/templates__instance_from_template__set_without_modify1.json
index bb3fb155b..a62360c56 100644
--- a/vid-automation/src/test/resources/asyncInstantiation/templates__instance_from_template__set_without_modify1.json
+++ b/vid-automation/src/test/resources/asyncInstantiation/templates__instance_from_template__set_without_modify1.json
@@ -137,7 +137,6 @@
}
],
"isMissingData": false,
- "lcpCloudRegionId": "hvf6",
"modelInfo": {
"modelCustomizationId": "4d0818cf-eaa9-4a3f-89c2-639953089e14",
"modelCustomizationName": "VprobeNcVnf..FE_base_module..module-0",
@@ -150,7 +149,6 @@
},
"rollbackOnFailure": true,
"sdncPreLoad": null,
- "tenantId": "4914ab0ab3a743e58f0eefdacc1dde77",
"uuid": "c5b26cc1-a66f-4b69-aa23-6abc7c647c88"
}
}
diff --git a/vid-automation/src/test/resources/asyncInstantiation/templates__instance_template.json b/vid-automation/src/test/resources/asyncInstantiation/templates__instance_template.json
index f186f90a6..56ba46be5 100644
--- a/vid-automation/src/test/resources/asyncInstantiation/templates__instance_template.json
+++ b/vid-automation/src/test/resources/asyncInstantiation/templates__instance_template.json
@@ -68,8 +68,6 @@
},
"instanceName": "hvf6arlba007_lba_Base_01",
"action": "Create",
- "lcpCloudRegionId": "hvf6",
- "tenantId": "4914ab0ab3a743e58f0eefdacc1dde77",
"instanceParams": [
{}
],
diff --git a/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts
index f7419ef33..bb2c01abd 100644
--- a/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts
@@ -104,16 +104,12 @@ describe('Drawing Board: Instantiation Templates', function () {
cy.editNode("node-c5b26cc1-a66f-4b69-aa23-6abc7c647c88-vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0")
.getElementByDataTestsId("instanceName").should('have.value', 'hvf6arlba007_lba_Base_01')
- .getElementByDataTestsId("lcpRegion").should('contain', 'hvf6')
- .getElementByDataTestsId("tenant").should('contain', 'DN5242-Nov21-T1')
.getElementByDataTestsId("rollback").should('contain', 'Rollback')
.getElementByDataTestsId("cancelButton").click();
cy.editNode("node-c09e4530-8fd8-418f-9483-2f57ce927b05-vprobe_nc_vnf0..VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1")
.getElementByDataTestsId("instanceName").should('have.value', 'my_hvf6arlba007_lba_dj_01')
.getElementByDataTestsId("volumeGroupName").should('have.value', 'my_special_hvf6arlba007_lba_dj_01_vol')
- .getElementByDataTestsId("lcpRegion").should('contain', 'hvf6')
- .getElementByDataTestsId("tenant").should('contain', 'DN5242-Nov21-T1')
.getElementByDataTestsId("rollback").should('contain', 'Rollback')
.getElementByDataTestsId("sdncPreLoad").should('have.value', 'on')
.getElementByDataTestsId("cancelButton").click();
@@ -156,8 +152,6 @@ describe('Drawing Board: Instantiation Templates', function () {
cy.editNode(`node-c09e4530-8fd8-418f-9483-2f57ce927b05-${module1CustomizationId}`, 1);
cy.clearInput("instanceName");
cy.typeToInput("instanceName", newVfModuleName);
- cy.selectDropdownOptionByText('lcpRegion', 'hvf6');
- cy.selectDropdownOptionByText('tenant', 'DN5242-Nov21-T1');
cy.getElementByDataTestsId('form-set').click();
// Then...
@@ -177,8 +171,6 @@ describe('Drawing Board: Instantiation Templates', function () {
{
instanceName: newVfModuleName,
volumeGroupName: `${newVfModuleName}_vol`,
- lcpCloudRegionId: "hvf6",
- tenantId: "4914ab0ab3a743e58f0eefdacc1dde77",
}
);