summaryrefslogtreecommitdiffstats
path: root/vid-webpack-master/cypress
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-12-26 15:21:17 +0200
committerIttay Stern <ittay.stern@att.com>2019-12-30 06:18:18 +0200
commit18c3ce8d1e1d166d5302f9708036202b0258110e (patch)
treefcbcf8f2c90472d538177cb5e359b17e7b757493 /vid-webpack-master/cypress
parenta371bcd5601df09063af5a00b1579ce197690bfd (diff)
Fixing the issue which prevents from clicking the [+] button on templates
i) Use modelUniqueName instead of obsolete originalName ii) Add RECREATE as "editable" case iii) Lift vfModules limitation in model to 3 Issue-ID: VID-724 Change-Id: I9e55142ee379f4eead3c8634f5b816d2d1db1f8e Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-webpack-master/cypress')
-rw-r--r--vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts20
-rw-r--r--vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/instantiationTemplates/templates__service_model.json8
2 files changed, 13 insertions, 15 deletions
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 68e7e75b3..e8b9d3c12 100644
--- a/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts
@@ -63,7 +63,9 @@ describe('Drawing Board: Instantiation Templates', function () {
.getElementByDataTestsId("sdncPreLoad").should('have.value', 'on')
.getElementByDataTestsId("cancelButton").click();
- assertThatBodyFromDeployRequestEqualsToTemplateFromBackEnd();
+ assertThatBodyFromDeployRequestEqualsToTemplateFromBackEnd([
+ {path: [...vnfPath, "vnfStoreKey"], value: "vProbe_NC_VNF 0"}, // side-effect
+ ]);
});
it(`Given a stored template - when "edit" service is opened - then template’s details are visible as expected`, function () {
@@ -81,9 +83,7 @@ describe('Drawing Board: Instantiation Templates', function () {
});
- it.skip(`Given a stored template - add one VfModule, edit it's details, and deploy - deploy is added with the vfModule details`, () => {
- // Test is disabled, as an issue currently prevents from clicking the [+] button.
-
+ it(`Given a stored template - add one VfModule, edit its details, and deploy - deploy is added with the vfModule details`, () => {
loadDrawingBoardWithRecreateMode();
let newVfModuleName = "new.vfmodule.name";
@@ -106,10 +106,6 @@ describe('Drawing Board: Instantiation Templates', function () {
// Then...
cy.getReduxState().then((state) => {
- let vnfPath = [
- "vnfs", "vProbe_NC_VNF 0"
- ];
-
let vfModules_1Path = [
...vnfPath, "vfModules", module1CustomizationId,
];
@@ -131,6 +127,7 @@ describe('Drawing Board: Instantiation Templates', function () {
);
assertThatBodyFromDeployRequestEqualsToTemplateFromBackEnd([
+ {path: [...vnfPath, "vnfStoreKey"], value: "vProbe_NC_VNF 0"}, // side-effect
{path: ["existingNames", newVfModuleName], value: ""},
{path: ["existingNames", `${newVfModuleName}_vol`], value: ""},
{path: latestVfModule_1Path, value: latestVfModule_1ExpectedValue},
@@ -174,9 +171,6 @@ describe('Drawing Board: Instantiation Templates', function () {
cy.getElementByDataTestsId('form-set').click();
// Then...
- let vnfPath = [
- "vnfs", "vProbe_NC_VNF 0"
- ];
let vfModule_0Path = [
...vnfPath, "vfModules",
"vprobe_nc_vnf0..VprobeNcVnf..FE_base_module..module-0",
@@ -203,6 +197,10 @@ describe('Drawing Board: Instantiation Templates', function () {
const serviceModelId = '6cfeeb18-c2b0-49df-987a-da47493c8e38';
+const vnfPath = [
+ "vnfs", "vProbe_NC_VNF 0"
+];
+
function loadDrawingBoardWithRecreateMode() {
const templateUuid = "46390edd-7100-46b2-9f18-419bd24fb60b";
diff --git a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/instantiationTemplates/templates__service_model.json b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/instantiationTemplates/templates__service_model.json
index 96c29a0b2..8234a7696 100644
--- a/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/instantiationTemplates/templates__service_model.json
+++ b/vid-webpack-master/cypress/support/jsonBuilders/mocks/jsons/instantiationTemplates/templates__service_model.json
@@ -82,7 +82,7 @@
"modelCustomizationName": "VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1",
"properties": {
"minCountInstances": 0,
- "maxCountInstances": null,
+ "maxCountInstances": 3,
"initialCount": 0,
"vfModuleLabel": "FE_Add_On_Module_vlbagent_eph",
"baseModule": false
@@ -102,7 +102,7 @@
"modelCustomizationName": "VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1",
"properties": {
"minCountInstances": 0,
- "maxCountInstances": null,
+ "maxCountInstances": 3,
"initialCount": 0,
"vfModuleLabel": "FE_Add_On_Module_vlbagent_eph",
"baseModule": false
@@ -165,7 +165,7 @@
"modelCustomizationName": "VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1",
"properties": {
"minCountInstances": 0,
- "maxCountInstances": null,
+ "maxCountInstances": 3,
"initialCount": 0,
"vfModuleLabel": "FE_Add_On_Module_vlbagent_eph",
"baseModule": false
@@ -185,7 +185,7 @@
"modelCustomizationName": "VprobeNcVnf..FE_Add_On_Module_vlbagent_eph..module-1",
"properties": {
"minCountInstances": 0,
- "maxCountInstances": null,
+ "maxCountInstances": 3,
"initialCount": 0,
"vfModuleLabel": "FE_Add_On_Module_vlbagent_eph",
"baseModule": false