[SDC-29] Amdocs OnBoard 1707 initial commit.

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

2 files changed, 57 insertions, 69 deletions

diff --git a/openecomp-ui/test/softwareProduct/components/monitoring/SoftwareProductComponentsMonitoring.test.js b/openecomp-ui/test/softwareProduct/components/monitoring/SoftwareProductComponentsMonitoring.test.js
index 2f1ea12c01..24658f1b30 100644
--- a/openecomp-ui/test/softwareProduct/components/monitoring/SoftwareProductComponentsMonitoring.test.js
+++ b/openecomp-ui/test/softwareProduct/components/monitoring/SoftwareProductComponentsMonitoring.test.js
@@ -1,57 +1,53 @@
-/*-
- * ============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/components/monitoring/SoftwareProductComponentsMonitoring.js';
 import SoftwareProductComponentsMonitoringView from 'sdc-app/onboarding/softwareProduct/components/monitoring/SoftwareProductComponentsMonitoringView.jsx';
 
+import {VSPComponentsMonitoringViewFactory} from 'test-utils/factories/softwareProduct/SoftwareProductComponentsMonitoringFactories.js';
+import VersionControllerUtilsFactory from 'test-utils/factories/softwareProduct/VersionControllerUtilsFactory.js';
+
+const version = VersionControllerUtilsFactory.build();
+
 describe('SoftwareProductComponentsMonitoring Module Tests', function () {
 
 	it('should mapper exist', () => {
-		expect(mapStateToProps).toExist();
+		expect(mapStateToProps).toBeTruthy();
 	});
 
 	it('should return empty file names', () => {
-		let softwareProduct = {softwareProductEditor: {data: {}}, softwareProductComponents: {monitoring: {}}};
+		let softwareProduct = {softwareProductEditor: {data: {...version}}, softwareProductComponents: {monitoring: {}}};
 		var results = mapStateToProps({softwareProduct});
 		expect(results.trapFilename).toEqual(undefined);
 		expect(results.pollFilename).toEqual(undefined);
 	});
 
 	it('should return trap file name', () => {
-		const monitoring = {
-			trapFilename: '123'
-		};
-		let softwareProduct = {softwareProductEditor: {data: {}}, softwareProductComponents: {monitoring}};
+		const monitoring = VSPComponentsMonitoringViewFactory.build({}, {snmpTrapFlag: true});
+		let softwareProduct = {softwareProductEditor: {data: {...version}}, softwareProductComponents: {monitoring}};
 		var results = mapStateToProps({softwareProduct});
 		expect(results.trapFilename).toEqual(monitoring.trapFilename);
 		expect(results.pollFilename).toEqual(undefined);
 	});
 
 	it('should return poll file names', () => {
-		const monitoring = {
-			pollFilename: '123'
-		};
-		let softwareProduct = {softwareProductEditor: {data: {}}, softwareProductComponents: {monitoring}};
+		const monitoring = VSPComponentsMonitoringViewFactory.build({}, {snmpPollFlag: true});
+		let softwareProduct = {softwareProductEditor: {data: {...version}}, softwareProductComponents: {monitoring}};
 		var results = mapStateToProps({softwareProduct});
 		expect(results.trapFilename).toEqual(undefined);
 		expect(results.pollFilename).toEqual(monitoring.pollFilename);
@@ -59,15 +55,12 @@ describe('SoftwareProductComponentsMonitoring Module Tests', function () {
 		let renderer = TestUtils.createRenderer();
 		renderer.render(<SoftwareProductComponentsMonitoringView {...results} />);
 		let renderedOutput = renderer.getRenderOutput();
-		expect(renderedOutput).toExist();
+		expect(renderedOutput).toBeTruthy();
 	});
 
 	it('should return both file names', () => {
-		const monitoring = {
-			trapFilename: '1234',
-			trapFilename: '123'
-		};
-		let softwareProduct = {softwareProductEditor: {data: {}}, softwareProductComponents: {monitoring}};
+		const monitoring =  VSPComponentsMonitoringViewFactory.build({}, {snmpTrapFlag: true, snmpPollFlag: true});
+		let softwareProduct = {softwareProductEditor: {data: {...version}}, softwareProductComponents: {monitoring}};
 		var results = mapStateToProps({softwareProduct});
 		expect(results.trapFilename).toEqual(monitoring.trapFilename);
 		expect(results.pollFilename).toEqual(monitoring.pollFilename);
@@ -75,7 +68,7 @@ describe('SoftwareProductComponentsMonitoring Module Tests', function () {
 		let renderer = TestUtils.createRenderer();
 		renderer.render(<SoftwareProductComponentsMonitoringView {...results} />);
 		let renderedOutput = renderer.getRenderOutput();
-		expect(renderedOutput).toExist();
+		expect(renderedOutput).toBeTruthy();
 	});
 
 	it('should change state to dragging', done => {
diff --git a/openecomp-ui/test/softwareProduct/components/monitoring/test.js b/openecomp-ui/test/softwareProduct/components/monitoring/test.js
index 172db653e9..dd0f850a89 100644
--- a/openecomp-ui/test/softwareProduct/components/monitoring/test.js
+++ b/openecomp-ui/test/softwareProduct/components/monitoring/test.js
@@ -1,31 +1,30 @@
-/*-
- * ============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 mockRest from 'test-utils/MockRest.js';
 import {storeCreator} from 'sdc-app/AppStore.js';
 import SoftwareProductComponentsMonitoringConstants from 'sdc-app/onboarding/softwareProduct/components/monitoring/SoftwareProductComponentsMonitoringConstants.js';
 import SoftwareProductComponentsMonitoringActionHelper from 'sdc-app/onboarding/softwareProduct/components/monitoring/SoftwareProductComponentsMonitoringActionHelper.js';
 
+import {VSPComponentsMonitoringRestFactory} from 'test-utils/factories/softwareProduct/SoftwareProductComponentsMonitoringFactories.js';
+import VersionControllerUtilsFactory from 'test-utils/factories/softwareProduct/VersionControllerUtilsFactory.js';
+
 const softwareProductId = '123';
 const componentId = '123';
+const version = VersionControllerUtilsFactory.build().version;
 
 describe('Software Product Components Monitoring Module Tests', function () {
 
@@ -38,18 +37,16 @@ describe('Software Product Components Monitoring Module Tests', function () {
 
 	it('Fetch for existing files - no files', done => {
 
-		let emptyResult = Object.freeze({
-			snmpTrap: undefined,
-			snmpPoll: undefined
-		});
+		let emptyResult = VSPComponentsMonitoringRestFactory.build();
 
 		mockRest.addHandler('fetch', ({ baseUrl}) => {
-			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${softwareProductId}/components/${componentId}/monitors/snmp`);
+			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${softwareProductId}/versions/${version.id}/components/${componentId}/monitors/snmp`);
 			return emptyResult;
 		});
 
 		SoftwareProductComponentsMonitoringActionHelper.fetchExistingFiles(store.dispatch, {
 			softwareProductId,
+			version,
 			componentId
 		});
 		setTimeout(()=> {
@@ -62,18 +59,16 @@ describe('Software Product Components Monitoring Module Tests', function () {
 	});
 
 	it('Fetch for existing files - only snmp trap file exists', done => {
-		let response = Object.freeze({
-			snmpTrap: 'asdfasdf',
-			snmpPoll: undefined
-		});
+		let response = VSPComponentsMonitoringRestFactory.build({}, {snmpTrapFlag: true});
 
 		mockRest.addHandler('fetch', ({ baseUrl}) => {
-			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${softwareProductId}/components/${componentId}/monitors/snmp`);
+			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${softwareProductId}/versions/${version.id}/components/${componentId}/monitors/snmp`);
 			return response;
 		});
 
 		SoftwareProductComponentsMonitoringActionHelper.fetchExistingFiles(store.dispatch, {
 			softwareProductId,
+			version,
 			componentId
 		});
 		setTimeout(()=> {
@@ -85,18 +80,16 @@ describe('Software Product Components Monitoring Module Tests', function () {
 	});
 
 	it('Fetch for existing files - only snmp poll file exists', done => {
-		let response = Object.freeze({
-			snmpPoll: 'asdfasdf',
-			snmpTrap: undefined
-		});
+		let response  = VSPComponentsMonitoringRestFactory.build({}, {snmpPollFlag: true});
 
 		mockRest.addHandler('fetch', ({baseUrl}) => {
-			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${softwareProductId}/components/${componentId}/monitors/snmp`);
+			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${softwareProductId}/versions/${version.id}/components/${componentId}/monitors/snmp`);
 			return response;
 		});
 
 		SoftwareProductComponentsMonitoringActionHelper.fetchExistingFiles(store.dispatch, {
 			softwareProductId,
+			version,
 			componentId
 		});
 		setTimeout(()=> {
@@ -108,18 +101,16 @@ describe('Software Product Components Monitoring Module Tests', function () {
 	});
 
 	it('Fetch for existing files - both files exist', done => {
-		let response = Object.freeze({
-			snmpPoll: 'asdfasdf',
-			snmpTrap: 'asdfgg'
-		});
+		let response = VSPComponentsMonitoringRestFactory.build({}, {snmpTrapFlag: true, snmpPollFlag: true});
 
 		mockRest.addHandler('fetch', ({baseUrl}) => {
-			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${softwareProductId}/components/${componentId}/monitors/snmp`);
+			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${softwareProductId}/versions/${version.id}/components/${componentId}/monitors/snmp`);
 			return response;
 		});
 
 		SoftwareProductComponentsMonitoringActionHelper.fetchExistingFiles(store.dispatch, {
 			softwareProductId,
+			version,
 			componentId
 		});
 		setTimeout(()=> {
@@ -132,8 +123,8 @@ describe('Software Product Components Monitoring Module Tests', function () {
 
 	it('Upload snmp trap file', done => {
 
-		mockRest.addHandler('create', ({baseUrl}) => {
-			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${softwareProductId}/components/${componentId}/monitors/snmp-trap/upload`);
+		mockRest.addHandler('post', ({baseUrl}) => {
+			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${softwareProductId}/versions/${version.id}/components/${componentId}/monitors/snmp-trap/upload`);
 			return {};
 		});
 		var debug = {hello: 'world'};
@@ -142,6 +133,7 @@ describe('Software Product Components Monitoring Module Tests', function () {
 		formData.append('upload', file);
 		SoftwareProductComponentsMonitoringActionHelper.uploadSnmpFile(store.dispatch, {
 			softwareProductId,
+			version,
 			componentId,
 			formData,
 			fileSize: file.size,
@@ -156,8 +148,8 @@ describe('Software Product Components Monitoring Module Tests', function () {
 	});
 
 	it('Upload snmp poll file', done => {
-		mockRest.addHandler('create', ({baseUrl}) => {
-			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${softwareProductId}/components/${componentId}/monitors/snmp/upload`);
+		mockRest.addHandler('post', ({baseUrl}) => {
+			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${softwareProductId}/versions/${version.id}/components/${componentId}/monitors/snmp/upload`);
 			return {};
 		});
 		var debug = {hello: 'world'};
@@ -166,6 +158,7 @@ describe('Software Product Components Monitoring Module Tests', function () {
 		formData.append('upload', file);
 		SoftwareProductComponentsMonitoringActionHelper.uploadSnmpFile(store.dispatch, {
 			softwareProductId,
+			version,
 			componentId,
 			formData,
 			fileSize: file.size,
@@ -181,11 +174,12 @@ describe('Software Product Components Monitoring Module Tests', function () {
 
 	it('Delete snmp trap file', done => {
 		mockRest.addHandler('destroy', ({baseUrl}) => {
-			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${softwareProductId}/components/${componentId}/monitors/snmp-trap`);
+			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${softwareProductId}/versions/${version.id}/components/${componentId}/monitors/snmp-trap`);
 			return {};
 		});
 		SoftwareProductComponentsMonitoringActionHelper.deleteSnmpFile(store.dispatch, {
 			softwareProductId,
+			version,
 			componentId,
 			type: SoftwareProductComponentsMonitoringConstants.SNMP_TRAP
 		});
@@ -198,11 +192,12 @@ describe('Software Product Components Monitoring Module Tests', function () {
 
 	it('Delete snmp poll file', done => {
 		mockRest.addHandler('destroy', ({baseUrl}) => {
-			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${softwareProductId}/components/${componentId}/monitors/snmp`);
+			expect(baseUrl).toEqual(`/onboarding-api/v1.0/vendor-software-products/${softwareProductId}/versions/${version.id}/components/${componentId}/monitors/snmp`);
 			return {};
 		});
 		SoftwareProductComponentsMonitoringActionHelper.deleteSnmpFile(store.dispatch, {
 			softwareProductId,
+			version,
 			componentId,
 			type: SoftwareProductComponentsMonitoringConstants.SNMP_POLL
 		});