[SDC-29] Amdocs OnBoard 1707 initial commit.

Change-Id: Ie4d12a3f574008b792899b368a0902a8b46b5370
Signed-off-by: AviZi <avi.ziv@amdocs.com>

3 files changed, 435 insertions, 494 deletions

diff --git a/openecomp-ui/test/softwareProduct/details/detailsView.test.js b/openecomp-ui/test/softwareProduct/details/detailsView.test.js
index b6a8ca5d4e..37c5df5079 100644
--- a/openecomp-ui/test/softwareProduct/details/detailsView.test.js
+++ b/openecomp-ui/test/softwareProduct/details/detailsView.test.js
@@ -1,87 +1,93 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
+/*!
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
-
-import expect from 'expect';
 import React from 'react';
 import TestUtils from 'react-addons-test-utils';
 import {mapStateToProps} from 'sdc-app/onboarding/softwareProduct/details/SoftwareProductDetails.js';
 import SoftwareProductDetailsView from 'sdc-app/onboarding/softwareProduct/details/SoftwareProductDetailsView.jsx';
-import {vspQschema as vspQuestionnaireSchema} from './vspQschema.js';
+import {VSPEditorFactory} from 'test-utils/factories/softwareProduct/SoftwareProductEditorFactories.js';
+import {CategoryWithSubFactory}  from 'test-utils/factories/softwareProduct/VSPCategoriesFactory.js';
+import {LicenseAgreementStoreFactory}  from 'test-utils/factories/licenseModel/LicenseAgreementFactories.js';
+import {FeatureGroupStoreFactory}  from 'test-utils/factories/licenseModel/FeatureGroupFactories.js';
+import {SchemaGenericFieldInfoFactory}  from 'test-utils/factories/softwareProduct/SoftwareProductQSchemaFactory.js';
+import {default as VspQdataFactory, VspDataMapFactory}  from 'test-utils/factories/softwareProduct/VspQdataFactory.js';
+import {FinalizedLicenseModelFactory} from 'test-utils/factories/licenseModel/LicenseModelFactories.js';
 
 describe('Software Product Details: ', function () {
 
-	let currentSoftwareProduct = {}, categories = [], finalizedLicenseModelList, licenseAgreementList, featureGroupsList, vspQschema;
+	let currentSoftwareProduct = {}, currentSoftwareProductWithLicensingData = {}, softwareProductCategories = [],
+		finalizedLicenseModelList, licenseAgreementList, featureGroupsList, qdata = {}, dataMap = {}, genericFieldInfo = {}, qGenericFieldInfo = {};
 	let dummyFunc = () => {};
 
-	before(function() {
-		currentSoftwareProduct = {
-			id: 'D4774719D085414E9D5642D1ACD59D20',
-			name: 'VSP',
-			description: 'dfdf',
-			category: 'category1',
-			subCategory: 'category1.subCategory',
-			vendorId: 'VLM_ID1',
-			vendorName: 'VLM1',
-			licensingVersion: '1.0',
-			licensingData: {}
+	beforeAll(function() {
+		finalizedLicenseModelList = FinalizedLicenseModelFactory.buildList(2);
+		currentSoftwareProduct = VSPEditorFactory.build({
+			id: 'RTRTG454545',
+			vendorId: finalizedLicenseModelList[0].id,
+			vendorName: finalizedLicenseModelList[0].vendorName
+		});
+		softwareProductCategories = CategoryWithSubFactory.buildList(2, {}, {quantity: 1});
+		licenseAgreementList = LicenseAgreementStoreFactory.buildList(2);
+		featureGroupsList = FeatureGroupStoreFactory.buildList(2, {referencingLicenseAgreements: [licenseAgreementList[0].id]});
+		qdata = VspQdataFactory.build();
+		dataMap = VspDataMapFactory.build();
+		currentSoftwareProductWithLicensingData = {
+			...currentSoftwareProduct,
+			licensingData: {
+				licenseAgreement: licenseAgreementList[0].id,
+				featureGroups: [featureGroupsList[0].id]
+			}
+		};
+		genericFieldInfo = {
+			'name': {
+				isValid: true,
+				errorText: '',
+				validations: [{type: 'validateName', data: true}, {type: 'maxLength', data: 120}, {
+					type: 'required',
+					data: true
+				}]
+			},
+			'description': {
+				isValid: true,
+				errorText: '',
+				validations: [{type: 'required', data: true}]
+			}
 		};
-		categories = [{
-			uniqueId: 'category1',
-			subcategories: [{
-				uniqueId: 'subCategory'
-			}]
-		}, {
-			uniqueId: 'category2',
-			subcategories: [{
-				uniqueId: 'subCategory2'
-			}]
-		}];
-		finalizedLicenseModelList = [{
-			id: 'VLM_ID1',
-			name: 'VLM1'
-		}];
-		licenseAgreementList = [{id: 'LA_ID1'}, {id: 'LA_ID2'}];
-		featureGroupsList = [
-			{id: 'FG_ID1', name: 'FG1', referencingLicenseAgreements: ['LA_ID1']},
-			{id: 'FG_ID2', name: 'FG2', referencingLicenseAgreements: ['LA_ID1']}
-		];
-		vspQschema = vspQuestionnaireSchema;
+		qGenericFieldInfo = SchemaGenericFieldInfoFactory.build();
 	});
 
 	it('should mapper exist', () => {
-		expect(mapStateToProps).toExist();
+		expect(mapStateToProps).toBeTruthy();
 	});
 
 	it('should mapper return vsp basic data', () => {
+
 		var obj = {
 			softwareProduct: {
 				softwareProductEditor: {
-					data: currentSoftwareProduct
+					data: currentSoftwareProduct,
+					genericFieldInfo
 				},
-				softwareProductCategories: categories,
+				softwareProductCategories,
 				softwareProductQuestionnaire: {
-					qdata: {},
-					qschema: vspQschema
+					qdata,
+					genericFieldInfo: qGenericFieldInfo,
+					dataMap
 				}
 			},
-			finalizedLicenseModelList: finalizedLicenseModelList,
+			finalizedLicenseModelList,
 			licenseModel: {
 				licenseAgreement: {
 					licenseAgreementList: []
@@ -96,35 +102,32 @@ describe('Software Product Details: ', function () {
 		expect(result.currentSoftwareProduct).toEqual(currentSoftwareProduct);
 		expect(result.finalizedLicenseModelList).toEqual(finalizedLicenseModelList);
 		expect(result.finalizedLicenseModelList.length).toBeGreaterThan(0);
-		expect(finalizedLicenseModelList).toInclude({
+		expect(finalizedLicenseModelList[0]).toMatchObject({
 			id: result.currentSoftwareProduct.vendorId,
-			name: result.currentSoftwareProduct.vendorName
+			vendorName: result.currentSoftwareProduct.vendorName
 		});
-		expect(result.softwareProductCategories).toEqual(categories);
+		expect(result.softwareProductCategories).toEqual(softwareProductCategories);
 		expect(result.licenseAgreementList).toEqual([]);
 		expect(result.featureGroupsList).toEqual([]);
-		expect(result.qdata).toEqual({});
-		expect(result.qschema).toEqual(vspQschema);
+		expect(result.qdata).toEqual(qdata);
+		expect(result.dataMap).toEqual(dataMap);
+		expect(result.isFormValid).toEqual(true);
 		expect(result.isReadOnlyMode).toEqual(true);
 	});
 
 	it('should mapper return vsp data with selected licenseAgreement and featureGroup', () => {
-		let vspWithLicensingData = {
-			...currentSoftwareProduct,
-			licensingData: {
-				licenseAgreement: 'LA_ID1',
-				featureGroups: [{enum: 'FG_ID1', title: 'FG1'}]
-			}
-		};
+
 		var obj = {
 			softwareProduct: {
 				softwareProductEditor: {
-					data: vspWithLicensingData
+					data: currentSoftwareProductWithLicensingData,
+					genericFieldInfo
 				},
-				softwareProductCategories: categories,
+				softwareProductCategories,
 				softwareProductQuestionnaire: {
-					qdata: {},
-					qschema: vspQschema
+					qdata,
+					genericFieldInfo: qGenericFieldInfo,
+					dataMap
 				}
 			},
 			finalizedLicenseModelList: finalizedLicenseModelList,
@@ -139,51 +142,36 @@ describe('Software Product Details: ', function () {
 		};
 
 		var result = mapStateToProps(obj);
-		expect(result.currentSoftwareProduct).toEqual(vspWithLicensingData);
+		expect(result.currentSoftwareProduct).toEqual(currentSoftwareProductWithLicensingData);
 		expect(result.finalizedLicenseModelList).toEqual(finalizedLicenseModelList);
 		expect(result.finalizedLicenseModelList.length).toBeGreaterThan(0);
-		expect(result.finalizedLicenseModelList).toInclude({
+		expect(result.finalizedLicenseModelList[0]).toMatchObject({
 			id: result.currentSoftwareProduct.vendorId,
-			name: result.currentSoftwareProduct.vendorName
+			vendorName: result.currentSoftwareProduct.vendorName
 		});
-		expect(result.softwareProductCategories).toEqual(categories);
+		expect(result.softwareProductCategories).toEqual(softwareProductCategories);
 		expect(result.licenseAgreementList).toEqual(licenseAgreementList);
-		expect(result.licenseAgreementList).toInclude({id: result.currentSoftwareProduct.licensingData.licenseAgreement});
+		expect(result.licenseAgreementList[0]).toMatchObject({...licenseAgreementList[0], id: result.currentSoftwareProduct.licensingData.licenseAgreement});
 		result.currentSoftwareProduct.licensingData.featureGroups.forEach(fg => {
-			expect(featureGroupsList).toInclude({
-				id: fg.enum,
-				name: fg.title,
-				referencingLicenseAgreements: [result.currentSoftwareProduct.licensingData.licenseAgreement]
-			});
-			expect(result.featureGroupsList).toInclude(fg);
+			expect(featureGroupsList[0]).toMatchObject({...featureGroupsList[0], id: fg});
 		});
-		expect(result.qdata).toEqual({});
-		expect(result.qschema).toEqual(vspQschema);
+		expect(result.qdata).toEqual(qdata);
 		expect(result.isReadOnlyMode).toEqual(true);
 	});
 
 	it('VSP Details view test', () => {
+
 		let params = {
-			currentSoftwareProduct: currentSoftwareProduct,
-			softwareProductCategories: categories,
-			qdata: {},
-			qschema: vspQschema,
-			finalizedLicenseModelList: [{
-				id: 'VLM_ID1',
-				vendorName: 'VLM1',
-				version: '2.0',
-				viewableVersions: ['1.0', '2.0']
-			}, {
-				id: 'VLM_ID2',
-				vendorName: 'VLM2',
-				version: '3.0',
-				viewableVersions: ['1.0', '2.0', '3.0']
-			}],
-			licenseAgreementList: [{id: 'LA_ID1'}, {id: 'LA_ID2'}],
-			featureGroupsList: [
-				{id: 'FG_ID1', name: 'FG1', referencingLicenseAgreements: ['LA_ID1']},
-				{id: 'FG_ID2', name: 'FG2', referencingLicenseAgreements: ['LA_ID1']}
-			]
+			currentSoftwareProduct,
+			softwareProductCategories,
+			qdata,
+			dataMap,
+			isFormValid: true,
+			finalizedLicenseModelList,
+			licenseAgreementList,
+			featureGroupsList,
+			genericFieldInfo,
+			qGenericFieldInfo,
 		};
 		var renderer = TestUtils.createRenderer();
 		renderer.render(
@@ -196,42 +184,26 @@ describe('Software Product Details: ', function () {
 				onVendorParamChanged = {dummyFunc}/>
 		);
 		let renderedOutput = renderer.getRenderOutput();
-		expect(renderedOutput).toExist();
+		expect(renderedOutput).toBeTruthy();
 	});
 
 	it('in view: should change vendorId and update vsp licensing-version', done => {
-		let vspWithLicensingData = {
-			...currentSoftwareProduct,
-			licensingData: {
-				licenseAgreement: 'LA_ID1',
-				featureGroups: [{enum: 'FG_ID1', title: 'FG1'}]
-			}
-		};
+
 		let params = {
-			currentSoftwareProduct: vspWithLicensingData,
-			softwareProductCategories: categories,
-			qdata: {},
-			qschema: vspQschema,
-			finalizedLicenseModelList: [{
-				id: 'VLM_ID1',
-				vendorName: 'VLM1',
-				version: '2.0',
-				viewableVersions: ['1.0', '2.0']
-			}, {
-				id: 'VLM_ID2',
-				vendorName: 'VLM2',
-				version: '3.0',
-				viewableVersions: ['1.0', '2.0', '3.0']
-			}],
-			licenseAgreementList: [{id: 'LA_ID1'}, {id: 'LA_ID2'}],
-			featureGroupsList: [
-				{id: 'FG_ID1', name: 'FG1', referencingLicenseAgreements: ['LA_ID1']},
-				{id: 'FG_ID2', name: 'FG2', referencingLicenseAgreements: ['LA_ID1']}
-			]
+			currentSoftwareProduct: currentSoftwareProductWithLicensingData,
+			softwareProductCategories,
+			qdata,
+			dataMap,
+			isFormValid: true,
+			genericFieldInfo,
+			qGenericFieldInfo,
+			finalizedLicenseModelList,
+			licenseAgreementList,
+			featureGroupsList
 		};
 		const onVendorChangedListener = (deltaData) => {
-			expect(deltaData.vendorId).toEqual('VLM_ID2');
-			expect(deltaData.vendorName).toEqual('VLM2');
+			expect(deltaData.vendorId).toEqual(finalizedLicenseModelList[1].id);
+			expect(deltaData.vendorName).toEqual(finalizedLicenseModelList[1].vendorName);
 			expect(deltaData.licensingVersion).toEqual('');
 			expect(deltaData.licensingData).toEqual({});
 			done();
@@ -241,7 +213,10 @@ describe('Software Product Details: ', function () {
 			currentSoftwareProduct = {params.currentSoftwareProduct}
 			softwareProductCategories = {params.softwareProductCategories}
 			qdata = {params.qdata}
-			qschema = {params.qschema}
+			qGenericFieldInfo = {params.qGenericFieldInfo}
+			genericFieldInfo = {params.genericFieldInfo}
+			isFormValid={params.isFormValid}
+			dataMap={params.dataMap}
 			finalizedLicenseModelList = {params.finalizedLicenseModelList}
 			licenseAgreementList = {params.licenseAgreementList}
 			featureGroupsList = {params.featureGroupsList}
@@ -250,37 +225,27 @@ describe('Software Product Details: ', function () {
 			onValidityChanged = {dummyFunc}
 			onQDataChanged = {dummyFunc}
 			onVendorParamChanged = {(deltaData) => onVendorChangedListener(deltaData)}/>);
-		expect(vspDetailsView).toExist();
-		vspDetailsView.onVendorParamChanged({vendorId: 'VLM_ID2'});
+		expect(vspDetailsView).toBeTruthy();
+		vspDetailsView.onVendorParamChanged({vendorId: finalizedLicenseModelList[1].id});
 	});
 
 	it('in view: should change licensing-version and update licensing data', done => {
 		let params = {
 			currentSoftwareProduct: currentSoftwareProduct,
-			softwareProductCategories: categories,
-			qdata: {},
-			qschema: vspQschema,
-			finalizedLicenseModelList: [{
-				id: 'VLM_ID1',
-				vendorName: 'VLM1',
-				version: '2.0',
-				viewableVersions: ['1.0', '2.0']
-			}, {
-				id: 'VLM_ID2',
-				vendorName: 'VLM2',
-				version: '3.0',
-				viewableVersions: ['1.0', '2.0', '3.0']
-			}],
-			licenseAgreementList: [{id: 'LA_ID1'}, {id: 'LA_ID2'}],
-			featureGroupsList: [
-				{id: 'FG_ID1', name: 'FG1', referencingLicenseAgreements: ['LA_ID1']},
-				{id: 'FG_ID2', name: 'FG2', referencingLicenseAgreements: ['LA_ID1']}
-			]
+			softwareProductCategories,
+			qdata,
+			dataMap,
+			isFormValid: true,
+			genericFieldInfo,
+			qGenericFieldInfo,
+			finalizedLicenseModelList,
+			licenseAgreementList,
+			featureGroupsList
 		};
 		const onVendorChangedListener = (deltaData) => {
-			expect(deltaData.vendorId).toEqual('VLM_ID2');
-			expect(deltaData.vendorName).toEqual('VLM2');
-			expect(deltaData.licensingVersion).toEqual('2.0');
+			expect(deltaData.vendorId).toEqual(finalizedLicenseModelList[1].id);
+			expect(deltaData.vendorName).toEqual(finalizedLicenseModelList[1].vendorName);
+			expect(deltaData.licensingVersion).toEqual(finalizedLicenseModelList[1].viewableVersion[0]);
 			expect(deltaData.licensingData).toEqual({});
 			done();
 		};
@@ -292,36 +257,26 @@ describe('Software Product Details: ', function () {
 			onValidityChanged = {dummyFunc}
 			onQDataChanged = {dummyFunc}
 			onVendorParamChanged = {(deltaData) => onVendorChangedListener(deltaData)}/>);
-		expect(vspDetailsView).toExist();
-		vspDetailsView.onVendorParamChanged({vendorId: 'VLM_ID2', licensingVersion: '2.0'});
+		expect(vspDetailsView).toBeTruthy();
+		vspDetailsView.onVendorParamChanged({vendorId: finalizedLicenseModelList[1].id, licensingVersion: finalizedLicenseModelList[1].viewableVersion[0]});
 	});
 
 	it('in view: should change subcategory', done => {
 		let params = {
 			currentSoftwareProduct: currentSoftwareProduct,
-			softwareProductCategories: categories,
-			qdata: {},
-			qschema: vspQschema,
-			finalizedLicenseModelList: [{
-				id: 'VLM_ID1',
-				vendorName: 'VLM1',
-				version: '2.0',
-				viewableVersions: ['1.0', '2.0']
-			}, {
-				id: 'VLM_ID2',
-				vendorName: 'VLM2',
-				version: '3.0',
-				viewableVersions: ['1.0', '2.0', '3.0']
-			}],
-			licenseAgreementList: [{id: 'LA_ID1'}, {id: 'LA_ID2'}],
-			featureGroupsList: [
-				{id: 'FG_ID1', name: 'FG1', referencingLicenseAgreements: ['LA_ID1']},
-				{id: 'FG_ID2', name: 'FG2', referencingLicenseAgreements: ['LA_ID1']}
-			]
+			softwareProductCategories,
+			qdata,
+			dataMap,
+			isFormValid: true,
+			genericFieldInfo,
+			qGenericFieldInfo,
+			finalizedLicenseModelList,
+			licenseAgreementList,
+			featureGroupsList
 		};
 		const onDataChangedListener = ({category, subCategory}) => {
-			expect(category).toEqual('category2');
-			expect(subCategory).toEqual('subCategory2');
+			expect(category).toEqual(softwareProductCategories[1].uniqueId);
+			expect(subCategory).toEqual(softwareProductCategories[1].subcategories[0].uniqueId);
 			done();
 		};
 
@@ -332,45 +287,29 @@ describe('Software Product Details: ', function () {
 			onValidityChanged = {dummyFunc}
 			onQDataChanged = {dummyFunc}
 			onVendorParamChanged = {dummyFunc}/>);
-		expect(vspDetailsView).toExist();
-		vspDetailsView.onSelectSubCategory('subCategory2');
+		expect(vspDetailsView).toBeTruthy();
+		vspDetailsView.onSelectSubCategory(softwareProductCategories[1].subcategories[0].uniqueId);
 	});
 
 	it('in view: should change feature groups', done => {
-		let vspWithLicensingData = {
-			...currentSoftwareProduct,
-			licensingData: {
-				licenseAgreement: 'LA_ID1',
-				featureGroups: [{enum: 'FG_ID1', title: 'FG1'}]
-			}
-		};
+
 		let params = {
-			currentSoftwareProduct: vspWithLicensingData,
-			softwareProductCategories: categories,
-			qdata: {},
-			qschema: vspQschema,
-			finalizedLicenseModelList: [{
-				id: 'VLM_ID1',
-				vendorName: 'VLM1',
-				version: '2.0',
-				viewableVersions: ['1.0', '2.0']
-			}, {
-				id: 'VLM_ID2',
-				vendorName: 'VLM2',
-				version: '3.0',
-				viewableVersions: ['1.0', '2.0', '3.0']
-			}],
-			licenseAgreementList: [{id: 'LA_ID1'}, {id: 'LA_ID2'}],
-			featureGroupsList: [
-				{id: 'FG_ID1', name: 'FG1', referencingLicenseAgreements: ['LA_ID1']},
-				{id: 'FG_ID2', name: 'FG2', referencingLicenseAgreements: ['LA_ID1']}
-			]
+			currentSoftwareProduct: currentSoftwareProductWithLicensingData,
+			softwareProductCategories,
+			qdata,
+			dataMap,
+			isFormValid: true,
+			genericFieldInfo,
+			qGenericFieldInfo,
+			finalizedLicenseModelList,
+			licenseAgreementList,
+			featureGroupsList
 		};
 		const onDataChangedListener = ({licensingData}) => {
-			expect(licensingData.licenseAgreement).toEqual('LA_ID1');
+			expect(licensingData.licenseAgreement).toEqual(licenseAgreementList[0].id);
 			expect(licensingData.featureGroups).toEqual([
-				{enum: 'FG_ID1', title: 'FG1'},
-				{enum: 'FG_ID2', title: 'FG2'}
+				{enum: featureGroupsList[0].id, title: featureGroupsList[0].name},
+				{enum: featureGroupsList[1].id, title: featureGroupsList[1].name}
 			]);
 			done();
 		};
@@ -382,45 +321,29 @@ describe('Software Product Details: ', function () {
 			onValidityChanged = {dummyFunc}
 			onQDataChanged = {dummyFunc}
 			onVendorParamChanged = {dummyFunc}/>);
-		expect(vspDetailsView).toExist();
+		expect(vspDetailsView).toBeTruthy();
 		vspDetailsView.onFeatureGroupsChanged({featureGroups: [
-			{enum: 'FG_ID1', title: 'FG1'},
-			{enum: 'FG_ID2', title: 'FG2'}
+			{enum: featureGroupsList[0].id, title: featureGroupsList[0].name},
+			{enum: featureGroupsList[1].id, title: featureGroupsList[1].name}
 		]});
 	});
 
 	it('in view: should change license agreement', done => {
-		let vspWithLicensingData = {
-			...currentSoftwareProduct,
-			licensingData: {
-				licenseAgreement: 'LA_ID1',
-				featureGroups: [{enum: 'FG_ID1', title: 'FG1'}]
-			}
-		};
+
 		let params = {
-			currentSoftwareProduct: vspWithLicensingData,
-			softwareProductCategories: categories,
-			qdata: {},
-			qschema: vspQschema,
-			finalizedLicenseModelList: [{
-				id: 'VLM_ID1',
-				vendorName: 'VLM1',
-				version: '2.0',
-				viewableVersions: ['1.0', '2.0']
-			}, {
-				id: 'VLM_ID2',
-				vendorName: 'VLM2',
-				version: '3.0',
-				viewableVersions: ['1.0', '2.0', '3.0']
-			}],
-			licenseAgreementList: [{id: 'LA_ID1'}, {id: 'LA_ID2'}],
-			featureGroupsList: [
-				{id: 'FG_ID1', name: 'FG1', referencingLicenseAgreements: ['LA_ID1']},
-				{id: 'FG_ID2', name: 'FG2', referencingLicenseAgreements: ['LA_ID1']}
-			]
+			currentSoftwareProduct: currentSoftwareProductWithLicensingData,
+			softwareProductCategories,
+			qdata,
+			dataMap,
+			isFormValid: true,
+			genericFieldInfo,
+			qGenericFieldInfo,
+			finalizedLicenseModelList,
+			licenseAgreementList,
+			featureGroupsList
 		};
 		const onDataChangedListener = ({licensingData}) => {
-			expect(licensingData.licenseAgreement).toEqual('LA_ID2');
+			expect(licensingData.licenseAgreement).toEqual(licenseAgreementList[1].id);
 			expect(licensingData.featureGroups).toEqual([]);
 			done();
 		};
@@ -432,7 +355,7 @@ describe('Software Product Details: ', function () {
 			onValidityChanged = {dummyFunc}
 			onQDataChanged = {dummyFunc}
 			onVendorParamChanged = {dummyFunc}/>);
-		expect(vspDetailsView).toExist();
-		vspDetailsView.onLicensingDataChanged({licenseAgreement: 'LA_ID2', featureGroups: []});
+		expect(vspDetailsView).toBeTruthy();
+		vspDetailsView.onLicensingDataChanged({licenseAgreement: licenseAgreementList[1].id, featureGroups: []});
 	});
 });
diff --git a/openecomp-ui/test/softwareProduct/details/test.js b/openecomp-ui/test/softwareProduct/details/test.js
index 9803b1611d..df84d184ce 100644
--- a/openecomp-ui/test/softwareProduct/details/test.js
+++ b/openecomp-ui/test/softwareProduct/details/test.js
@@ -1,84 +1,65 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
+/*!
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
-
-import {expect} from 'chai';
 import deepFreeze from 'deep-freeze';
 import mockRest from 'test-utils/MockRest.js';
-import {cloneAndSet} from 'test-utils/Util.js';
+import {cloneAndSet, buildFromExistingObject} from 'test-utils/Util.js';
 import {storeCreator} from 'sdc-app/AppStore.js';
 
 import SoftwareProductCreationActionHelper from 'sdc-app/onboarding/softwareProduct/creation/SoftwareProductCreationActionHelper.js';
 import SoftwareProductActionHelper from 'sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js';
 import SoftwareProductCategoriesHelper from 'sdc-app/onboarding/softwareProduct/SoftwareProductCategoriesHelper.js';
+import {forms} from 'sdc-app/onboarding/softwareProduct/SoftwareProductConstants.js';
+import ValidationHelper from 'sdc-app/common/helpers/ValidationHelper.js';
+
+import {VSPEditorFactory, VSPEditorPostFactory, VSPEditorFactoryWithLicensingData, VSPEditorPostFactoryWithLicensingData} from 'test-utils/factories/softwareProduct/SoftwareProductEditorFactories.js';
+import {CategoryFactory}  from 'test-utils/factories/softwareProduct/VSPCategoriesFactory.js';
+import {heatSetupManifest} from 'test-utils/factories/softwareProduct/SoftwareProductAttachmentsFactories.js';
+
+import { FeatureGroupStoreFactory as FeatureGroup} from 'test-utils/factories/licenseModel/FeatureGroupFactories.js';
+import {LicenseAgreementStoreFactory as LicenseAgreement} from 'test-utils/factories/licenseModel/LicenseAgreementFactories.js';
+import VersionControllerUtilsFactory from 'test-utils/factories/softwareProduct/VersionControllerUtilsFactory.js';
+
 
 describe('Software Product Module Tests', function () {
 	it('Get Software Products List', () => {
 		const store = storeCreator();
 		deepFreeze(store.getState());
-
-		const softwareProductList = [
-			{
-				name: 'VSP1',
-				description: 'hjhj',
-				version: '0.1',
-				id: 'EBADF561B7FA4A788075E1840D0B5971',
-				subCategory: 'resourceNewCategory.network connectivity.virtual links',
-				category: 'resourceNewCategory.network connectivity',
-				vendorId: '5259EDE4CC814DC9897BA6F69E2C971B',
-				vendorName: 'Vendor',
-				checkinStatus: 'CHECK_OUT',
-				licensingData: {
-					'featureGroups': []
-				}
-			},
-			{
-				name: 'VSP2',
-				description: 'dfdfdfd',
-				version: '0.1',
-				id: '2F47447D22DB4C53B020CA1E66201EF2',
-				subCategory: 'resourceNewCategory.network connectivity.virtual links',
-				category: 'resourceNewCategory.network connectivity',
-				vendorId: '5259EDE4CC814DC9897BA6F69E2C971B',
-				vendorName: 'Vendor',
-				checkinStatus: 'CHECK_OUT',
-				licensingData: {
-					featureGroups: []
-				}
-			}
-		];
-
+		const softwareProductList = VSPEditorFactory.buildList(2);
 		deepFreeze(softwareProductList);
-
 		deepFreeze(store.getState());
-
 		const expectedStore = cloneAndSet(store.getState(), 'softwareProductList', softwareProductList);
 
 		mockRest.addHandler('fetch', ({options, data, baseUrl}) => {
-			expect(baseUrl).to.equal('/onboarding-api/v1.0/vendor-software-products/');
-			expect(data).to.deep.equal(undefined);
-			expect(options).to.equal(undefined);
+			expect(baseUrl).toEqual('/onboarding-api/v1.0/vendor-software-products/');
+			expect(data).toEqual(undefined);
+			expect(options).toEqual(undefined);
 			return {results: softwareProductList};
 		});
 
+		mockRest.addHandler('fetch', ({options, data, baseUrl}) => {
+			expect(baseUrl).toEqual('/onboarding-api/v1.0/vendor-software-products/?versionFilter=Final');
+			expect(data).toEqual(undefined);
+			expect(options).toEqual(undefined);
+			return {results: []};
+		});
+
 		return SoftwareProductActionHelper.fetchSoftwareProductList(store.dispatch).then(() => {
-			expect(store.getState()).to.deep.equal(expectedStore);
+			return SoftwareProductActionHelper.fetchFinalizedSoftwareProductList(store.dispatch);
+		}).then(() => {
+			expect(store.getState()).toEqual(expectedStore);
 		});
 	});
 
@@ -86,62 +67,195 @@ describe('Software Product Module Tests', function () {
 		const store = storeCreator();
 		deepFreeze(store.getState());
 
-		const softwareProductPostRequest = deepFreeze({
-			name: 'vsp1',
-			description: 'string',
-			vendorId: '1',
-			vendorName: 'Vendor',
-			icon: 'icon',
-			subCategory: 'resourceNewCategory.network connectivity.virtual links',
-			category: 'resourceNewCategory.network connectivity',
-			licensingData: {}
-		});
+		const softwareProductPostRequest = VSPEditorPostFactory.build();
+		deepFreeze(softwareProductPostRequest);
+		const idFromResponse = '1';
+		const expectedVSP = VSPEditorPostFactory.build({id: idFromResponse, vendorId: softwareProductPostRequest.vendorId});
+		deepFreeze(expectedVSP);
 
-		const softwareProductToAdd = deepFreeze({
-			...softwareProductPostRequest
+		mockRest.addHandler('post', ({options, data, baseUrl}) => {
+			expect(baseUrl).toEqual('/onboarding-api/v1.0/vendor-software-products/');
+			expect(data).toEqual(softwareProductPostRequest);
+			expect(options).toEqual(undefined);
+			return {
+				vspId: idFromResponse
+			};
 		});
 
-		const softwareProductIdFromResponse = 'ADDED_ID';
-		const softwareProductAfterAdd = deepFreeze({
-			...softwareProductToAdd,
-			id: softwareProductIdFromResponse
+		return SoftwareProductCreationActionHelper.createSoftwareProduct(store.dispatch, {
+			softwareProduct: softwareProductPostRequest
+		}).then((response) => {
+			expect(response.vspId).toEqual(idFromResponse);
 		});
+	});
+
+	it('Fetch Software Product with manifest', () => {
+		const store = storeCreator();
+		deepFreeze(store.getState());
 
-		const expectedStore = cloneAndSet(store.getState(), 'softwareProductList', [softwareProductAfterAdd]);
+		const softwareProductPostRequest = VSPEditorPostFactory.build();
+		deepFreeze(softwareProductPostRequest);
+
+		const expectedGenericInfo = {
+			'name': {
+				isValid: true,
+				errorText: '',
+				validations: [{type: 'validateName', data: true}, {type: 'maxLength', data: 25}, {
+					type: 'required',
+					data: true
+				}]
+			},
+			'description': {
+				isValid: true,
+				errorText: '',
+				validations: [{type: 'required', data: true}]
+			}
+		};
+		const expectedFormName = forms.VENDOR_SOFTWARE_PRODUCT_DETAILS;
+
+		const idFromResponse = '1';
+		const version = { id: '0.1', label: '0.1'};
+		const expectedVSP = VSPEditorPostFactory.build({id: idFromResponse, vendorId: softwareProductPostRequest.vendorId});
+		deepFreeze(expectedVSP);
+		let expectedStore = cloneAndSet(store.getState(), 'softwareProduct.softwareProductEditor.data', expectedVSP);
+		expectedStore = cloneAndSet(expectedStore, 'softwareProduct.softwareProductEditor.genericFieldInfo', expectedGenericInfo);
+		expectedStore = cloneAndSet(expectedStore, 'softwareProduct.softwareProductEditor.formName', expectedFormName);
+		expectedStore = cloneAndSet(expectedStore, 'softwareProduct.softwareProductQuestionnaire', {qdata: {}, dataMap: {}, qgenericFieldInfo: {}});
+
+		expectedStore = cloneAndSet(expectedStore, 'softwareProduct.softwareProductAttachments.heatValidation', {
+			'attachmentsTree': {},
+			'errorList': [],
+			'selectedNode': 'All'
+		});
+		let manifest = heatSetupManifest.build();
+		expectedStore = cloneAndSet(expectedStore, 'softwareProduct.softwareProductAttachments.heatSetup', manifest);
 
-		mockRest.addHandler('create', ({options, data, baseUrl}) => {
-			expect(baseUrl).to.equal('/onboarding-api/v1.0/vendor-software-products/');
-			expect(data).to.deep.equal(softwareProductPostRequest);
-			expect(options).to.equal(undefined);
+		mockRest.addHandler('post', ({options, data, baseUrl}) => {
+			expect(baseUrl).toEqual('/onboarding-api/v1.0/vendor-software-products/');
+			expect(data).toEqual(softwareProductPostRequest);
+			expect(options).toEqual(undefined);
 			return {
-				vspId: softwareProductIdFromResponse
+				vspId: idFromResponse,
+				version
 			};
 		});
 
+		mockRest.addHandler('fetch', ({options, data, baseUrl}) => {
+			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${idFromResponse}/versions/${version.id}`);
+			expect(data).toEqual(undefined);
+			expect(options).toEqual(undefined);
+			return expectedVSP;
+		});
+
+		mockRest.addHandler('fetch', ({options, data, baseUrl}) => {
+			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${idFromResponse}/versions/${version.id}/questionnaire`);
+			expect(data).toEqual(undefined);
+			expect(options).toEqual(undefined);
+			return {data: JSON.stringify({}), schema: JSON.stringify({})};
+		});
+
+		mockRest.addHandler('fetch', ({options, data, baseUrl}) => {
+			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${idFromResponse}/versions/${version.id}/orchestration-template-candidate/manifest`);
+			expect(data).toEqual(undefined);
+			expect(options).toEqual(undefined);
+			return manifest;
+		});
+
 		return SoftwareProductCreationActionHelper.createSoftwareProduct(store.dispatch, {
-			softwareProduct: softwareProductToAdd
+			softwareProduct: softwareProductPostRequest
+		}).then(() => {
+			return SoftwareProductActionHelper.fetchSoftwareProduct(store.dispatch, {softwareProductId: idFromResponse, version});
 		}).then(() => {
-			expect(store.getState()).to.deep.equal(expectedStore);
+			return SoftwareProductActionHelper.loadSoftwareProductHeatCandidate(store.dispatch, {softwareProductId: idFromResponse, version});
+		}).then(() => {
+			expect(store.getState()).toEqual(expectedStore);
+			let newName = 'newName';
+			expectedStore = cloneAndSet(expectedStore, 'softwareProduct.softwareProductEditor.formReady', null);
+			ValidationHelper.dataChanged(store.dispatch, {deltaData: {'name': newName}, formName: forms.VENDOR_SOFTWARE_PRODUCT_DETAILS});
+			expectedStore = cloneAndSet(expectedStore, 'softwareProduct.softwareProductEditor.data.name', newName);
+			expect(store.getState()).toEqual(expectedStore);
 		});
 	});
+
+	it('Load and edit Software Product licensing data', () => {
+		const store = storeCreator();
+
+		const softwareProductPostRequest = VSPEditorPostFactory.build();
+		deepFreeze(softwareProductPostRequest);
+
+		const licenseModelId = softwareProductPostRequest.vendorId;
+		const LMVersion = VersionControllerUtilsFactory.build().version;
+		const secondLicenseModelId = 'secondLicenseModelId';
+
+		let FG1 = FeatureGroup.build();
+		let LA1 = LicenseAgreement.build({
+			featureGroupsIds: [FG1.id]
+		});
+
+		let FG2 = FeatureGroup.build();
+		let LA2 = LicenseAgreement.build({
+			featureGroupsIds: [FG2.id]
+		});
+
+		mockRest.addHandler('fetch', ({options, data, baseUrl}) => {
+			expect(baseUrl).toEqual('/sdc1/feProxy/rest/v1/categories/resources/');
+			expect(data).toEqual(undefined);
+			expect(options).toEqual(undefined);
+			return [];
+		});
+
+		mockRest.addHandler('fetch', ({options, data, baseUrl}) => {
+			expect(baseUrl).toEqual('/onboarding-api/v1.0/vendor-license-models/?versionFilter=Final');
+			expect(data).toEqual(undefined);
+			expect(options).toEqual(undefined);
+			return {results: []};
+		});
+
+		mockRest.addHandler('fetch', ({options, data, baseUrl}) => {
+			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-license-models/${licenseModelId}/versions/${LMVersion.id}/license-agreements`);
+			expect(data).toEqual(undefined);
+			expect(options).toEqual(undefined);
+			return {results: [LA1]};
+		});
+
+		mockRest.addHandler('fetch', ({options, data, baseUrl}) => {
+			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-license-models/${licenseModelId}/versions/${LMVersion.id}/feature-groups`);
+			expect(data).toEqual(undefined);
+			expect(options).toEqual(undefined);
+			return {results: [FG1]};
+		});
+
+		mockRest.addHandler('fetch', ({options, data, baseUrl}) => {
+			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-license-models/${secondLicenseModelId}/versions/${LMVersion.id}/license-agreements`);
+			expect(data).toEqual(undefined);
+			expect(options).toEqual(undefined);
+			return {results: [LA2]};
+		});
+
+		mockRest.addHandler('fetch', ({options, data, baseUrl}) => {
+			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-license-models/${secondLicenseModelId}/versions/${LMVersion.id}/feature-groups`);
+			expect(data).toEqual(undefined);
+			expect(options).toEqual(undefined);
+			return {results: [FG2]};
+		});
+
+		return SoftwareProductActionHelper.loadSoftwareProductDetailsData(store.dispatch, {licenseModelId, licensingVersion: LMVersion}).then(() => {
+			let state = store.getState();
+			expect(state.licenseModel.licenseAgreement.licenseAgreementList).toEqual([LA1]);
+			expect(state.licenseModel.featureGroup.featureGroupsList).toEqual([FG1]);
+			return SoftwareProductActionHelper.softwareProductEditorVendorChanged(store.dispatch,
+				{deltaData: {vendorId: secondLicenseModelId, licensingVersion: LMVersion},
+					formName: forms.VENDOR_SOFTWARE_PRODUCT_DETAILS});
+		}).then(() => {
+			let state = store.getState();
+			expect(state.licenseModel.licenseAgreement.licenseAgreementList).toEqual([LA2]);
+			expect(state.licenseModel.featureGroup.featureGroupsList).toEqual([FG2]);
+		});
+	});
+
 	it('Save Software product', () => {
-		const softwareProduct = {
-			name: 'VSP5',
-			id: '4730033D16C64E3CA556AB0AC4478218',
-			description: 'A software model for Fortigate.',
-			subCategory: 'resourceNewCategory.network connectivity.virtual links',
-			category: 'resourceNewCategory.network connectivity',
-			vendorId: '1',
-			vendorName: 'Vendor',
-			licensingVersion: '1.0',
-			icon: 'icon',
-			licensingData: {
-				licenceAgreement: '123',
-				featureGroups: [
-					'123', '234'
-				]
-			}
-		};
+
+		const softwareProduct = VSPEditorFactoryWithLicensingData.build();
 		deepFreeze(softwareProduct);
 
 		const store = storeCreator({
@@ -152,15 +266,20 @@ describe('Software Product Module Tests', function () {
 		});
 		deepFreeze(store.getState());
 
-		const toBeUpdatedSoftwareProductId = softwareProduct.id;
-		const softwareProductUpdateData = {
-			...softwareProduct,
+		const dataForUpdate = {
 			name: 'VSP5_UPDATED',
 			description: 'A software model for Fortigate._UPDATED'
 		};
+
+		const toBeUpdatedSoftwareProductId = softwareProduct.id;
+		let  softwareProductUpdateData = VSPEditorPostFactoryWithLicensingData.build(dataForUpdate);
+		delete softwareProductUpdateData.version;
+
+		const softwareProductPutRequest = buildFromExistingObject(VSPEditorFactoryWithLicensingData, softwareProductUpdateData, {id: toBeUpdatedSoftwareProductId, version: softwareProduct.version});
+
 		deepFreeze(softwareProductUpdateData);
 
-		const expectedStore = cloneAndSet(store.getState(), 'softwareProductList', [softwareProductUpdateData]);
+		const expectedStore = cloneAndSet(store.getState(), 'softwareProductList', [softwareProductPutRequest]);
 		const questionnaireData = {
 			general: {
 				affinityData: {
@@ -171,60 +290,30 @@ describe('Software Product Module Tests', function () {
 		};
 		deepFreeze(questionnaireData);
 
-		mockRest.addHandler('save', ({data, options, baseUrl}) => {
-			const expectedData = {
-				name: 'VSP5_UPDATED',
-				description: 'A software model for Fortigate._UPDATED',
-				subCategory: 'resourceNewCategory.network connectivity.virtual links',
-				category: 'resourceNewCategory.network connectivity',
-				vendorId: '1',
-				vendorName: 'Vendor',
-				licensingVersion: '1.0',
-				icon: 'icon',
-				licensingData: {
-					licenceAgreement: '123',
-					featureGroups: [
-						'123', '234'
-					]
-				}
-			};
-			expect(baseUrl).to.equal(`/onboarding-api/v1.0/vendor-software-products/${toBeUpdatedSoftwareProductId}`);
-			expect(data).to.deep.equal(expectedData);
-			expect(options).to.equal(undefined);
+		mockRest.addHandler('put', ({data, options, baseUrl}) => {
+			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${toBeUpdatedSoftwareProductId}/versions/${softwareProduct.version.id}`);
+			expect(data).toEqual(softwareProductUpdateData);
+			expect(options).toEqual(undefined);
 			return {returnCode: 'OK'};
 		});
-		mockRest.addHandler('save', ({data, options, baseUrl}) => {
-			expect(baseUrl).to.equal(`/onboarding-api/v1.0/vendor-software-products/${toBeUpdatedSoftwareProductId}/questionnaire`);
-			expect(data).to.deep.equal(questionnaireData);
-			expect(options).to.equal(undefined);
+		mockRest.addHandler('put', ({data, options, baseUrl}) => {
+			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${toBeUpdatedSoftwareProductId}/versions/${softwareProduct.version.id}/questionnaire`);
+			expect(data).toEqual(questionnaireData);
+			expect(options).toEqual(undefined);
 			return {returnCode: 'OK'};
 		});
 
 		return SoftwareProductActionHelper.updateSoftwareProduct(store.dispatch, {
-			softwareProduct: softwareProductUpdateData,
+			softwareProduct: softwareProductPutRequest,
 			qdata: questionnaireData
 		}).then(() => {
-			expect(store.getState()).to.deep.equal(expectedStore);
+			expect(store.getState()).toEqual(expectedStore);
 		});
 	});
+
 	it('Save Software product data only', () => {
-		const softwareProduct = {
-			name: 'VSP5',
-			id: '4730033D16C64E3CA556AB0AC4478218',
-			description: 'A software model for Fortigate.',
-			subCategory: 'resourceNewCategory.network connectivity.virtual links',
-			category: 'resourceNewCategory.network connectivity',
-			vendorId: '1',
-			vendorName: 'Vendor',
-			licensingVersion: '1.0',
-			icon: 'icon',
-			licensingData: {
-				licenceAgreement: '123',
-				featureGroups: [
-					'123', '234'
-				]
-			}
-		};
+
+		const softwareProduct = VSPEditorFactoryWithLicensingData.build();
 		deepFreeze(softwareProduct);
 
 		const store = storeCreator({
@@ -236,61 +325,35 @@ describe('Software Product Module Tests', function () {
 		deepFreeze(store.getState());
 		const expectedStore = store.getState();
 
-		const toBeUpdatedSoftwareProductId = softwareProduct.id;
-		const softwareProductUpdateData = {
-			...softwareProduct,
+		const dataForUpdate = {
 			name: 'VSP5_UPDATED',
 			description: 'A software model for Fortigate._UPDATED'
 		};
+
+		const toBeUpdatedSoftwareProductId = softwareProduct.id;
+		let  softwareProductUpdateData = VSPEditorPostFactoryWithLicensingData.build(dataForUpdate);
+		delete softwareProductUpdateData.version;
+
+		const softwareProductPutRequest = buildFromExistingObject(VSPEditorFactoryWithLicensingData, softwareProductUpdateData, {id: toBeUpdatedSoftwareProductId, version: softwareProduct.version});
+
 		deepFreeze(softwareProductUpdateData);
 
-		mockRest.addHandler('save', ({data, options, baseUrl}) => {
-			const expectedData = {
-				name: 'VSP5_UPDATED',
-				description: 'A software model for Fortigate._UPDATED',
-				subCategory: 'resourceNewCategory.network connectivity.virtual links',
-				category: 'resourceNewCategory.network connectivity',
-				vendorId: '1',
-				vendorName: 'Vendor',
-				licensingVersion: '1.0',
-				icon: 'icon',
-				licensingData: {
-					licenceAgreement: '123',
-					featureGroups: [
-						'123', '234'
-					]
-				}
-			};
-			expect(baseUrl).to.equal(`/onboarding-api/v1.0/vendor-software-products/${toBeUpdatedSoftwareProductId}`);
-			expect(data).to.deep.equal(expectedData);
-			expect(options).to.equal(undefined);
+		mockRest.addHandler('put', ({data, options, baseUrl}) => {
+			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${toBeUpdatedSoftwareProductId}/versions/${softwareProduct.version.id}`);
+			expect(data).toEqual(softwareProductUpdateData);
+			expect(options).toEqual(undefined);
 			return {returnCode: 'OK'};
 		});
 
 		return SoftwareProductActionHelper.updateSoftwareProductData(store.dispatch, {
-			softwareProduct: softwareProductUpdateData
+			softwareProduct: softwareProductPutRequest
 		}).then(() => {
-			expect(store.getState()).to.deep.equal(expectedStore);
+			expect(store.getState()).toEqual(expectedStore);
 		});
 	});
 
 	it('Save Software product questionnaire only', () => {
-		const softwareProduct = {
-			name: 'VSP5',
-			id: '4730033D16C64E3CA556AB0AC4478218',
-			description: 'A software model for Fortigate.',
-			subCategory: 'resourceNewCategory.network connectivity.virtual links',
-			category: 'resourceNewCategory.network connectivity',
-			vendorId: '1',
-			vendorName: 'Vendor',
-			icon: 'icon',
-			licensingData: {
-				licenceAgreement: '123',
-				featureGroups: [
-					'123', '234'
-				]
-			}
-		};
+		const softwareProduct = VSPEditorFactoryWithLicensingData.build();
 		deepFreeze(softwareProduct);
 
 		const store = storeCreator({
@@ -313,71 +376,30 @@ describe('Software Product Module Tests', function () {
 		};
 		deepFreeze(questionnaireData);
 
-		mockRest.addHandler('save', ({data, options, baseUrl}) => {
-			expect(baseUrl).to.equal(`/onboarding-api/v1.0/vendor-software-products/${toBeUpdatedSoftwareProductId}/questionnaire`);
-			expect(data).to.deep.equal(questionnaireData);
-			expect(options).to.equal(undefined);
+		mockRest.addHandler('put', ({data, options, baseUrl}) => {
+			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${toBeUpdatedSoftwareProductId}/versions/${softwareProduct.version.id}/questionnaire`);
+			expect(data).toEqual(questionnaireData);
+			expect(options).toEqual(undefined);
 			return {returnCode: 'OK'};
 		});
 
 		return SoftwareProductActionHelper.updateSoftwareProductQuestionnaire(store.dispatch, {
 			softwareProductId: softwareProduct.id,
+			version: softwareProduct.version,
 			qdata: questionnaireData
 		}).then(() => {
-			expect(store.getState()).to.deep.equal(expectedStore);
+			expect(store.getState()).toEqual(expectedStore);
 		});
 	});
 
 	it('Handle category without subcategories', () => {
-		const categories = deepFreeze([
-			{
-				name: 'Resource Category 1',
-				normalizedName: 'resource category 1',
-				uniqueId: 'resourceNewCategory.resource category 1',
-				subcategories: [
-					{
-						name: 'Sub Category for RC 1',
-						normalizedName: 'sub category for rc 1',
-						uniqueId: 'resourceNewCategory.resource category 1.sub category for rc 1'
-					},
-					{
-						name: 'SC4RC2',
-						normalizedName: 'sc4rc2',
-						uniqueId: 'resourceNewCategory.resource category 1.sc4rc2'
-					},
-					{
-						name: 'SC4RC1',
-						normalizedName: 'sc4rc1',
-						uniqueId: 'resourceNewCategory.resource category 1.sc4rc1'
-					}
-				]
-			},
-			{
-				name: 'Eeeeee',
-				normalizedName: 'eeeeee',
-				uniqueId: 'resourceNewCategory.eeeeee'
-			},
-			{
-				name: 'Some Recource',
-				normalizedName: 'some recource',
-				uniqueId: 'resourceNewCategory.some recource',
-				subcategories: [
-					{
-						name: 'Second Sub Category for S',
-						normalizedName: 'second sub category for s',
-						uniqueId: 'resourceNewCategory.some recource.second sub category for s'
-					},
-					{
-						name: 'Sub Category for Some Rec',
-						normalizedName: 'sub category for some rec',
-						uniqueId: 'resourceNewCategory.some recource.sub category for some rec'
-					}
-				]
-			}
-		]);
-		const category = SoftwareProductCategoriesHelper.getCurrentCategoryOfSubCategory('resourceNewCategory.some recource.sub category for some rec', categories);
-		expect(category).to.equal('resourceNewCategory.some recource');
+
+		const categories = CategoryFactory.buildList(3);
+		categories[0].subcategories = CategoryFactory.buildList(3);
+		categories[2].subcategories = CategoryFactory.buildList(3);
+
+		const category = SoftwareProductCategoriesHelper.getCurrentCategoryOfSubCategory(categories[2].subcategories[2].uniqueId, categories);
+		expect(category).toEqual(categories[2].uniqueId);
 	});
 
 });
-
diff --git a/openecomp-ui/test/softwareProduct/details/vspQschema.js b/openecomp-ui/test/softwareProduct/details/vspQschema.js
index 5612b19991..fb8ac6fd91 100644
--- a/openecomp-ui/test/softwareProduct/details/vspQschema.js
+++ b/openecomp-ui/test/softwareProduct/details/vspQschema.js
@@ -1,21 +1,17 @@
-/*-
- * ============LICENSE_START=======================================================
- * SDC
- * ================================================================================
+/*!
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+ *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END=========================================================
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing
+ * permissions and limitations under the License.
  */
 
 export const vspQschema = {