summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIttay Stern <ittay.stern@att.com>2019-11-18 17:38:03 +0000
committerGerrit Code Review <gerrit@onap.org>2019-11-18 17:38:03 +0000
commitab4243c9b71a08f760d85529abebea521eb45c7f (patch)
tree5307f40437661f709f6e766a3e7931d5e73e68b6
parent4c2de1c9790b3312201494462699f982f711fbd3 (diff)
parentf351975cd32c9bc6c721746554fd17392c98fb32 (diff)
Merge "when automatically add aLaCarte VfModule, rollbackOnFailure is true"
-rw-r--r--vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.spec.ts2
-rw-r--r--vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.ts1
2 files changed, 3 insertions, 0 deletions
diff --git a/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.spec.ts b/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.spec.ts
index a34f2fe20..03461eaa1 100644
--- a/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.spec.ts
+++ b/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.spec.ts
@@ -32,6 +32,7 @@ describe('Default Data Generator Service', () => {
let result = service.generateVFModule(serviceHierarchy.vnfs[vnfUUID].vfModules[vnfModuleUUID], [], false, true);
expect(result.isMissingData).toBeTruthy();
+ expect(result.rollbackOnFailure).toBeTruthy();
});
test('generateVFModule should create vf module object', () => {
@@ -51,6 +52,7 @@ describe('Default Data Generator Service', () => {
expect(result.sdncPreReload).toBeNull();
expect(result.isMissingData).toBeTruthy();
expect(result.instanceParams).toEqual([{}]);
+ expect(result.rollbackOnFailure).toBeNull();
});
test('generateVNFData should create vnf object', () => {
diff --git a/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.ts b/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.ts
index b0baa82ec..3046b332a 100644
--- a/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.ts
+++ b/vid-webpack-master/src/app/shared/services/defaultDataServiceGenerator/default.data.generator.service.ts
@@ -328,6 +328,7 @@ export class DefaultDataGeneratorService {
instanceParams
],
'trackById': DefaultDataGeneratorService.createRandomTrackById(),
+ 'rollbackOnFailure' : isALaCarte ? true : null,
};
}