summaryrefslogtreecommitdiffstats
path: root/vid-webpack-master
diff options
context:
space:
mode:
authorEylon Malin <eylon.malin@intl.att.com>2020-01-12 13:59:18 +0000
committerGerrit Code Review <gerrit@onap.org>2020-01-12 13:59:18 +0000
commit63ab2aa201b213d6b7d5b5b42fed4a76deecf18d (patch)
tree5006e433318cc20c2e6269203762bffffaa9f56e /vid-webpack-master
parent860899da8b3e43085c131cc848d35ea50d6c52ed (diff)
parentac489f52aa04baea9b68b2b170d15d23b8894dff (diff)
Merge "Instance name (VNF name and VG) is displayed"
Diffstat (limited to 'vid-webpack-master')
-rw-r--r--vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts51
-rw-r--r--vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service.ts2
2 files changed, 31 insertions, 22 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 5afcc9748..40306fcfd 100644
--- a/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts
+++ b/vid-webpack-master/cypress/integration/iFrames/instantiation-templates.e2e.ts
@@ -52,16 +52,25 @@ describe('Drawing Board: Instantiation Templates', function () {
.fillVnfPopup()
.getDrawingBoardDeployBtn().click()
.wait('@expectedPostAsyncInstantiation').then(xhr => {
- const vnfRequest = bodyOf(xhr).vnfs['vProbe_NC_VNF 0_1'];
-
- expect(vnfRequest.action).equals("Create");
- expect(vnfRequest.rollbackOnFailure).equals("true");
- expect(vnfRequest.originalName).equals("vProbe_NC_VNF 0");
- expect(vnfRequest.productFamilyId).equals("a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb");
- expect(vnfRequest.lcpCloudRegionId).equals("hvf6");
- expect(vnfRequest.lineOfBusiness).equals("zzz1");
- expect(vnfRequest.platformName).equals("xxx1");
- expect(vnfRequest.tenantId).equals("229bcdc6eaeb4ca59d55221141d01f8e");
+ const vnfRequest = bodyOf(xhr).vnfs['vProbe_NC_VNF 0_1'];
+
+ expect(vnfRequest.action).equals("Create");
+ expect(vnfRequest.rollbackOnFailure).equals("true");
+ expect(vnfRequest.originalName).equals("vProbe_NC_VNF 0");
+ expect(vnfRequest.productFamilyId).equals("a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb");
+ expect(vnfRequest.lcpCloudRegionId).equals("hvf6");
+ expect(vnfRequest.lineOfBusiness).equals("zzz1");
+ expect(vnfRequest.platformName).equals("xxx1");
+ expect(vnfRequest.tenantId).equals("229bcdc6eaeb4ca59d55221141d01f8e");
+
+
+ // check instance name not change if empty
+ editNode('node-21ae311e-432f-4c54-b855-446d0b8ded72-vProbe_NC_VNF 0', 0)
+ .clearInput('instanceName');
+ cy.getElementByDataTestsId('form-set').click({force: true}).then((done) => {
+ editNode('node-21ae311e-432f-4c54-b855-446d0b8ded72-vProbe_NC_VNF 0', 0)
+ .getElementByDataTestsId('instanceName').should('be.empty')
+ });
});
});
@@ -73,7 +82,7 @@ describe('Drawing Board: Instantiation Templates', function () {
.getTagElementContainsText('button', 'Duplicate').click()
.getDrawingBoardDeployBtn().click()
.wait('@expectedPostAsyncInstantiation').then(xhr => {
- expect(Object.keys(bodyOf(xhr).vnfs).length).equals(numberOfDuplicate + 1);
+ expect(Object.keys(bodyOf(xhr).vnfs).length).equals(numberOfDuplicate + 1);
});
});
@@ -143,11 +152,11 @@ describe('Drawing Board: Instantiation Templates', function () {
.click({force: true});
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();
+ cy.clearInput("instanceName");
+ cy.typeToInput("instanceName", newVfModuleName);
+ cy.selectDropdownOptionByText('lcpRegion', 'hvf6');
+ cy.selectDropdownOptionByText('tenant', 'DN5242-Nov21-T1');
+ cy.getElementByDataTestsId('form-set').click();
// Then...
cy.getReduxState().then((state) => {
@@ -251,7 +260,7 @@ describe('Drawing Board: Instantiation Templates', function () {
});
- it(`Given a stored template of Network - - it is loaded`, () => {
+ it(`Given a stored template of Network - - it is loaded`, () => {
loadDrawingBoardWithRecreateModeNetwork();
@@ -261,7 +270,7 @@ describe('Drawing Board: Instantiation Templates', function () {
assertThatBodyFromDeployRequestEqualsToTemplateFromBackEnd_network();
});
- it(`Given a stored template of Network - User can remove existing network`, () => {
+ it(`Given a stored template of Network - User can remove existing network`, () => {
loadDrawingBoardWithRecreateModeNetwork();
@@ -286,9 +295,9 @@ describe('Drawing Board: Instantiation Templates', function () {
// add new node
addNewNode('node-SR-IOV Provider 2-1-add-btn')
- .fillNetworkPopup()
- .getDrawingBoardDeployBtn().click()
- .wait('@expectedPostAsyncInstantiation').then(xhr => {
+ .fillNetworkPopup()
+ .getDrawingBoardDeployBtn().click()
+ .wait('@expectedPostAsyncInstantiation').then(xhr => {
const networkRequest = bodyOf(xhr).networks['SR-IOV Provider 2-1_1'];
expect(networkRequest.action).equals("Create");
diff --git a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service.ts b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service.ts
index e82ea5d85..acfaf78ab 100644
--- a/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service.ts
+++ b/vid-webpack-master/src/app/shared/components/genericForm/formControlsServices/sharedControlles/shared.controllers.service.ts
@@ -167,7 +167,7 @@ export class SharedControllersService {
placeHolder: (!isEcompGeneratedNaming) ? 'Instance name' : 'Automatically generated when not provided',
validations: validations,
isVisible : true,
- value : (!isEcompGeneratedNaming || (!_.isNil(instance) && !_.isNil(instance.instanceName)))
+ value : (!isEcompGeneratedNaming || (!_.isNil(instance) && !_.isNil(instance.instanceName) && instance.instanceName !== ""))
? this._basicControlGenerator.getDefaultInstanceName(instance, model) : null,
onKeypress : (event) => {
const pattern:RegExp = ControlGeneratorUtil.INSTANCE_NAME_REG_EX;