Merge "when automatically add aLaCarte VfModule, rollbackOnFailure is true"

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,
     };
   }