Change variable names to catalog

Change-Id: Iaa4f2143840de47feaf25d110144cd762f6ff8ec
Issue-ID: SDC-887
Signed-off-by: ilanap <ilanap@amdocs.com>

8 files changed, 23 insertions, 23 deletions

diff --git a/openecomp-ui/src/sdc-app/common/merge/MergeEditorActionHelper.js b/openecomp-ui/src/sdc-app/common/merge/MergeEditorActionHelper.js
index 3885ee4051..92ec60b999 100644
--- a/openecomp-ui/src/sdc-app/common/merge/MergeEditorActionHelper.js
+++ b/openecomp-ui/src/sdc-app/common/merge/MergeEditorActionHelper.js
@@ -32,8 +32,8 @@ import {DATE_FORMAT} from 'sdc-app/onboarding/OnboardingConstants.js';
 import ScreensHelper from 'sdc-app/common/helpers/ScreensHelper.js';
 
 function softwareProductCategoriesUrl() {
-	const restATTPrefix = Configuration.get('restATTPrefix');
-	return `${restATTPrefix}/v1/categories/resources/`;
+	const restCatalogPrefix = Configuration.get('restCatalogPrefix');
+	return `${restCatalogPrefix}/v1/categories/resources/`;
 }
 
 function versionUrl(itemId, versionId) {
diff --git a/openecomp-ui/src/sdc-app/config/Configuration.js b/openecomp-ui/src/sdc-app/config/Configuration.js
index 3d9ab8bf72..8444e3fa61 100644
--- a/openecomp-ui/src/sdc-app/config/Configuration.js
+++ b/openecomp-ui/src/sdc-app/config/Configuration.js
@@ -27,18 +27,18 @@ class Configuration {
 		return prev;
 	}
 
-	setATTApiRoot(ATTApiRoot) {
-		let restATTPrefix = ATTApiRoot,
-			restPrefix = ATTApiRoot.replace(/\/feProxy\b[^:]*$/, '/feProxy/onboarding-api');
+	setCatalogApiRoot(CatalogApiRoot) {
+		let restCatalogPrefix = CatalogApiRoot,
+			restPrefix = CatalogApiRoot.replace(/\/feProxy\b[^:]*$/, '/feProxy/onboarding-api');
 
 		this.set('restPrefix', restPrefix);
-		this.set('restATTPrefix', restATTPrefix);
+		this.set('restCatalogPrefix', restCatalogPrefix);
 	}
 
-	setATTApiHeaders(ATTApiHeaders) {
-		this.set('ATTApiHeaders', ATTApiHeaders);
+	setCatalogApiHeaders(CatalogApiHeaders) {
+		this.set('CatalogApiHeaders', CatalogApiHeaders);
 
-		let {userId: {value: UserID} = {}} = ATTApiHeaders;
+		let {userId: {value: UserID} = {}} = CatalogApiHeaders;
 		this.set('UserID', UserID);
 	}
 }
@@ -47,7 +47,7 @@ const configuration = new Configuration();
 
 (function setDefaultRestPrefixes(configuration) {
 	configuration.set('restPrefix', configuration.get('defaultRestPrefix'));
-	configuration.set('restATTPrefix', configuration.get('defaultRestATTPrefix'));
+	configuration.set('restCatalogPrefix', configuration.get('defaultRestCatalogPrefix'));
 	configuration.set('appContextPath', configuration.get('appContextPath'));
 })(configuration);
 (function setDefaultWebsocketConfig(configuration) {
diff --git a/openecomp-ui/src/sdc-app/config/config.json b/openecomp-ui/src/sdc-app/config/config.json
index e73856e5bb..fbfaf1de66 100644
--- a/openecomp-ui/src/sdc-app/config/config.json
+++ b/openecomp-ui/src/sdc-app/config/config.json
@@ -4,7 +4,7 @@
 	"build": "dev",
 	"appContextPath" : "/onboarding",
 	"defaultRestPrefix": "/onboarding-api",
-	"defaultRestATTPrefix": "/sdc1/feProxy/rest",
+	"defaultRestCatalogPrefix": "/sdc1/feProxy/rest",
 	"defaultWebsocketPort" : "8181",
 	"defaultDebugWebsocketPort" : "9000",
 	"defaultWebsocketPath" : "notification-api/ws/notificationHandler"
diff --git a/openecomp-ui/src/sdc-app/flows/FlowsActions.js b/openecomp-ui/src/sdc-app/flows/FlowsActions.js
index 5a751064df..61a419b314 100644
--- a/openecomp-ui/src/sdc-app/flows/FlowsActions.js
+++ b/openecomp-ui/src/sdc-app/flows/FlowsActions.js
@@ -20,8 +20,8 @@ import SequenceDiagramModelHelper from './SequenceDiagramModelHelper.js';
 
 
 function baseUrl(serviceId, artifactId = '') {
-	const restATTPrefix = Configuration.get('restATTPrefix');
-	return `${restATTPrefix}/v1/catalog/services/${serviceId}/artifacts/${artifactId}`;
+	const restCatalogPrefix = Configuration.get('restCatalogPrefix');
+	return `${restCatalogPrefix}/v1/catalog/services/${serviceId}/artifacts/${artifactId}`;
 }
 
 function encodeDataToBase64(dataAsString) {
diff --git a/openecomp-ui/src/sdc-app/flows/FlowsPunchOut.jsx b/openecomp-ui/src/sdc-app/flows/FlowsPunchOut.jsx
index 873003492b..a2a5554203 100644
--- a/openecomp-ui/src/sdc-app/flows/FlowsPunchOut.jsx
+++ b/openecomp-ui/src/sdc-app/flows/FlowsPunchOut.jsx
@@ -45,8 +45,8 @@ export default class DiagramPunchOut {
 	render({options: {data, apiRoot, apiHeaders}, onEvent}, element) {
 
 		if (!this.isConfigSet) {
-			Configuration.setATTApiRoot(apiRoot);
-			Configuration.setATTApiHeaders(apiHeaders);
+			Configuration.setCatalogApiRoot(apiRoot);
+			Configuration.setCatalogApiHeaders(apiHeaders);
 			this.isConfigSet = true;
 		}
 
diff --git a/openecomp-ui/src/sdc-app/onboarding/OnboardingPunchOut.jsx b/openecomp-ui/src/sdc-app/onboarding/OnboardingPunchOut.jsx
index 06c95b0b2f..e576bb3f85 100644
--- a/openecomp-ui/src/sdc-app/onboarding/OnboardingPunchOut.jsx
+++ b/openecomp-ui/src/sdc-app/onboarding/OnboardingPunchOut.jsx
@@ -205,8 +205,8 @@ export default class OnboardingPunchOut {
 		}
 
 		if (!this.isConfigSet) {
-			Configuration.setATTApiRoot(apiRoot);
-			Configuration.setATTApiHeaders(apiHeaders);
+			Configuration.setCatalogApiRoot(apiRoot);
+			Configuration.setCatalogApiHeaders(apiHeaders);
 			this.isConfigSet = true;
 		}
 
diff --git a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js
index 355c823afe..ebd660f71c 100644
--- a/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js
+++ b/openecomp-ui/src/sdc-app/onboarding/softwareProduct/SoftwareProductActionHelper.js
@@ -58,8 +58,8 @@ function baseUrl() {
 	return `${restPrefix}/v1.0/vendor-software-products/`;
 }
 function softwareProductCategoriesUrl() {
-	const restATTPrefix = Configuration.get('restATTPrefix');
-	return `${restATTPrefix}/v1/categories/resources/`;
+	const restCatalogPrefix = Configuration.get('restCatalogPrefix');
+	return `${restCatalogPrefix}/v1/categories/resources/`;
 }
 
 function uploadFile(vspId, formData, version) {
diff --git a/openecomp-ui/src/sdc-app/onboarding/users/UsersActionHelper.js b/openecomp-ui/src/sdc-app/onboarding/users/UsersActionHelper.js
index 8a9ff42238..a2e92fe0bc 100644
--- a/openecomp-ui/src/sdc-app/onboarding/users/UsersActionHelper.js
+++ b/openecomp-ui/src/sdc-app/onboarding/users/UsersActionHelper.js
@@ -19,15 +19,15 @@ import Configuration from 'sdc-app/config/Configuration.js';
 import {actionTypes} from './UsersConstants.js';
 
 function getUserId() {
-	let attApiHeaders = Configuration.get('ATTApiHeaders');
-	let User = attApiHeaders && attApiHeaders.userId;
+	let catalogApiHeaders = Configuration.get('CatalogApiHeaders');
+	let User = catalogApiHeaders && catalogApiHeaders.userId;
 	let userId = User && User.value ? User.value : '';
 	return userId;
 }
 
 function baseUrl() {
-	const restATTPrefix = Configuration.get('restATTPrefix');
-	return `${restATTPrefix}`;
+	const restCatalogPrefix = Configuration.get('restCatalogPrefix');
+	return `${restCatalogPrefix}`;
 }