when there is no max instances for VfModule show Unlimited (default) in model info

Issue-ID: VID-726
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
Change-Id: I3718c0f89204d5272872dca18f3e953e05a94dfe

2 files changed, 14 insertions, 8 deletions

diff --git a/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts
index 133dbe72a..4eb5445ad 100644
--- a/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/drawingBoard.e2e.ts
@@ -257,6 +257,12 @@ describe('Drawing board', function () {
       cy.addMacroVfModule(vnfName, vfModuleName, 'module-3');
       cy.getElementByDataTestsId('node-d6557200-ecf2-4641-8094-5393ae3aae60-VF_vGeraldine 0').click();
       cy.getElementByDataTestsId('node-41708296-e443-4c71-953f-d9a010f059e1-vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2').should('have.length', 3);
+
+      //make sure max instances in model info show Unlimited (default)
+      cy.drawingBoardTreeOpenContextMenuByElementDataTestId('node-41708296-e443-4c71-953f-d9a010f059e1-vf_vgeraldine0..VfVgeraldine..vflorence_gpb..module-2', 0)
+        .drawingBoardTreeClickOnContextMenuOptionByName('Edit')
+        .getElementByDataTestsId('model-item-value-max').contains('Unlimited (default)')
+        .getElementByDataTestsId("cancelButton").click();
     });
 
     it('when there is no max_instances for VNF, it can be added multiple times ', () => {
diff --git a/vid-webpack-master/cypress/integration/iFrames/vnf.popup.e2e.ts b/vid-webpack-master/cypress/integration/iFrames/vnf.popup.e2e.ts
index 41ab83399..74ce2a772 100644
--- a/vid-webpack-master/cypress/integration/iFrames/vnf.popup.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/vnf.popup.e2e.ts
@@ -49,10 +49,10 @@ describe('Vnf popup', function () {
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
         cy.getElementByDataTestsId('node-2017-488_PASQUALE-vPE 0-add-btn').click({force : true});
-        cy.getElementByDataTestsId('model-item-label-vnf-min').contains('Minimum to instantiate');
-        cy.getElementByDataTestsId('model-item-value-vnf-min').contains('100');
-        cy.getElementByDataTestsId('model-item-label-vnf-max').contains('Maximum to instantiate');
-        cy.getElementByDataTestsId('model-item-value-vnf-max').contains('200');
+        cy.getElementByDataTestsId('model-item-label-min').contains('Minimum to instantiate');
+        cy.getElementByDataTestsId('model-item-value-min').contains('100');
+        cy.getElementByDataTestsId('model-item-label-max').contains('Maximum to instantiate');
+        cy.getElementByDataTestsId('model-item-value-max').contains('200');
       })
     });
 
@@ -63,10 +63,10 @@ describe('Vnf popup', function () {
         cy.setReduxState(<any>res);
         cy.openIframe('app/ui/#/servicePlanning?serviceModelId=2f80c596-27e5-4ca9-b5bb-e03a7fd4c0fd');
         cy.getElementByDataTestsId('node-2017-488_PASQUALE-vPE 0-add-btn').click({force : true});
-        cy.getElementByDataTestsId('model-item-label-vnf-min').contains('Minimum to instantiate');
-        cy.getElementByDataTestsId('model-item-value-vnf-min').contains('0');
-        cy.getElementByDataTestsId('model-item-label-vnf-max').contains('Maximum to instantiate');
-        cy.getElementByDataTestsId('model-item-value-vnf-max').contains('Unlimited (default)');
+        cy.getElementByDataTestsId('model-item-label-min').contains('Minimum to instantiate');
+        cy.getElementByDataTestsId('model-item-value-min').contains('0');
+        cy.getElementByDataTestsId('model-item-label-max').contains('Maximum to instantiate');
+        cy.getElementByDataTestsId('model-item-value-max').contains('Unlimited (default)');
       })
      });