Create on boarding docker

Add BE and Cassandra init docker images

Change-Id: Id9d767c73fc946819cec821b4634ce650cbb22fd
Issue-ID: SDC-781
Signed-off-by: Michael Lando <ml636r@att.com>

7 files changed, 52 insertions, 33 deletions

diff --git a/test-apis-ci/pom.xml b/test-apis-ci/pom.xml
index c998a28ff1..65974c61ac 100644
--- a/test-apis-ci/pom.xml
+++ b/test-apis-ci/pom.xml
@@ -562,7 +562,6 @@
                                     <dockerFileDir>${project.basedir}/sdc-api-tests</dockerFileDir>
                                     <tags>
                                         <tag>${docker.tag}</tag>
-                                        <tag>${docker.latest.tag}</tag>
                                         <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest</tag>
                                     </tags>
                                 </build>
diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/templates/default/sdc-sanity.yaml.erb b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/templates/default/sdc-sanity.yaml.erb
index 8dde3cdefe..3684b38e32 100644
--- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/templates/default/sdc-sanity.yaml.erb
+++ b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/templates/default/sdc-sanity.yaml.erb
@@ -6,6 +6,14 @@ catalogFeHost:  <%= @webportal_ip %>
 catalogFePort:  <%= @webportal_port %>
 catalogBeHost:  <%= @catalogBE_ip %>
 catalogBePort:  <%= @catalogBE_port %>
+onboardingBeHost:  <%= node['ONBOARDING_BE_VIP'] %>
+<% if node[:disableHttp] -%>
+sdcHttpMethod: https
+onboardingBePort:  <%= node['ONBOARDING_BE'][:https_port] %>
+<% else %>
+sdcHttpMethod: http
+onboardingBePort:  <%= node['ONBOARDING_BE'][:http_port] %>
+<% end -%>
 disributionClientPort: 8181
 esPort: 9200
 
@@ -30,13 +38,6 @@ cassandraTruststorePassword : Aa123456
 cassandraAuditKeySpace: sdcAudit
 cassandraArtifactKeySpace: sdcArtifact
 
-# catalog backend protocol
-<% if node[:disableHttp] -%>
-sdcHttpMethod: https
-<% else %>
-sdcHttpMethod: http
-<% end -%>
-
 localDataCenter: DC-Automate01
 
 stopOnClassFailure: false
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/config/Config.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/config/Config.java
index 9f7043d509..f251c2dcae 100644
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/config/Config.java
+++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/config/Config.java
@@ -62,6 +62,9 @@ public class Config {
 	private String catalogBePort;
 	private String catalogBeTlsPort;
 
+	private String onboardingBeHost;
+	private String onboardingBePort;
+
 	private String neoDBusername;
 	private String neoDBpassword;
 
@@ -113,6 +116,22 @@ public class Config {
 		super();
 	}
 
+	public String getOnboardingBePort() {
+		return onboardingBePort;
+	}
+
+	public void setOnboardingBePort(String onboardingBePort) {
+		this.onboardingBePort = onboardingBePort;
+	}
+
+	public String getOnboardingBeHost() {
+		return onboardingBeHost;
+	}
+
+	public void setOnboardingBeHost(String onboardingBeHost) {
+		this.onboardingBeHost = onboardingBeHost;
+	}
+
 	public static class TestPackages {
 
 		List<String> packages;
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtillViaApis.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtillViaApis.java
index 8637a9ba7a..5f9ec1bfc8 100644
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtillViaApis.java
+++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtillViaApis.java
@@ -235,7 +235,7 @@ public class OnboardingUtillViaApis {
 	public static Either<String, RestResponse> getVendorSoftwareProduct(String vspId, User user, Boolean validateState) throws Exception {
 
 		Config config = Utils.getConfig();
-		String url = String.format(Urls.GET_VENDOR_SOFTWARE_PRODUCT, config.getCatalogBeHost(), config.getCatalogBePort(), vspId);
+		String url = String.format(Urls.GET_VENDOR_SOFTWARE_PRODUCT, config.getOnboardingBeHost(), config.getOnboardingBePort(), vspId);
 		String userId = user.getUserId();
 		Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
 		headersMap.put(HttpHeaderEnum.X_ECOMP_REQUEST_ID_HEADER.getValue(), "123456");
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtils.java
index c1950dfd08..6c3a3c4cd4 100644
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtils.java
+++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/OnboardingUtils.java
@@ -136,7 +136,7 @@ public class OnboardingUtils {
 
 	private static RestResponse actionOnComponent(String vspid, String body, String onboardComponent, User user, String componentVersion) throws Exception {
 		Config config = Utils.getConfig();
-		String url = String.format(Urls.ACTION_ON_COMPONENT, config.getCatalogBeHost(), config.getCatalogBePort(), onboardComponent, vspid, componentVersion);
+		String url = String.format(Urls.ACTION_ON_COMPONENT, config.getOnboardingBeHost(), config.getOnboardingBePort(), onboardComponent, vspid, componentVersion);
 		String userId = user.getUserId();
 		Map<String, String> headersMap = prepareHeadersMap(userId);
 
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/VendorLicenseModelRestUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/VendorLicenseModelRestUtils.java
index ec368df621..276897924f 100644
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/VendorLicenseModelRestUtils.java
+++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/VendorLicenseModelRestUtils.java
@@ -44,7 +44,7 @@ public class VendorLicenseModelRestUtils {
 
      private static RestResponse getVLMComponentByVersion(String vlmId, String vlmVersion, User user) throws Exception{
         Config config = Utils.getConfig();
-        String url = String.format(Urls.GET_VLM_COMPONENT_BY_VERSION, config.getCatalogBeHost(),config.getCatalogBePort(), vlmId,vlmVersion);
+        String url = String.format(Urls.GET_VLM_COMPONENT_BY_VERSION, config.getOnboardingBeHost(),config.getOnboardingBePort(), vlmId,vlmVersion);
         String userId = user.getUserId();
 
         Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
@@ -102,7 +102,7 @@ public class VendorLicenseModelRestUtils {
 
     private static RestResponse actionOnComponent(String vspid, String body, String onboardComponent, User user, String componentVersion) throws Exception {
         Config config = Utils.getConfig();
-        String url = String.format(Urls.ACTION_ON_COMPONENT, config.getCatalogBeHost(), config.getCatalogBePort(), onboardComponent, vspid, componentVersion);
+        String url = String.format(Urls.ACTION_ON_COMPONENT, config.getOnboardingBeHost(), config.getOnboardingBePort(), onboardComponent, vspid, componentVersion);
         String userId = user.getUserId();
         Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
 
@@ -113,7 +113,7 @@ public class VendorLicenseModelRestUtils {
 
     private static RestResponse createMethodVendorLicense(String vendorId, String body, String onboardComponent, User user, String componentVersion) throws Exception {
         Config config = Utils.getConfig();
-        String url = String.format(Urls.CREATE_METHOD, config.getCatalogBeHost(), config.getCatalogBePort(), onboardComponent, vendorId, componentVersion);
+        String url = String.format(Urls.CREATE_METHOD, config.getOnboardingBeHost(), config.getOnboardingBePort(), onboardComponent, vendorId, componentVersion);
         String userId = user.getUserId();
         Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
 
@@ -145,7 +145,7 @@ public class VendorLicenseModelRestUtils {
 
     public static RestResponse createVendorLicenseModels_1(String name, User user) throws Exception {
         Config config = Utils.getConfig();
-        String url = String.format(Urls.CREATE_VENDOR_LISENCE_MODELS, config.getCatalogBeHost(), config.getCatalogBePort());
+        String url = String.format(Urls.CREATE_VENDOR_LISENCE_MODELS, config.getOnboardingBeHost(), config.getOnboardingBePort());
         String userId = user.getUserId();
 
         JSONObject jObject = new JSONObject();
@@ -164,7 +164,7 @@ public class VendorLicenseModelRestUtils {
     public static RestResponse createVendorLicenseAgreement_5(String vspid, String versionId, String featureGroupId, User user)
             throws Exception {
         Config config = Utils.getConfig();
-        String url = String.format(Urls.CREATE_VENDOR_LISENCE_AGREEMENT, config.getCatalogBeHost(), config.getCatalogBePort(), vspid, versionId);
+        String url = String.format(Urls.CREATE_VENDOR_LISENCE_AGREEMENT, config.getOnboardingBeHost(), config.getOnboardingBePort(), vspid, versionId);
         String userId = user.getUserId();
 
         JSONObject licenseTermpObject = new JSONObject();
@@ -188,7 +188,7 @@ public class VendorLicenseModelRestUtils {
     public static RestResponse createVendorLicenseFeatureGroups_4(String vspid, String versionId, String licenseKeyGroupId,
                                                                   String entitlementPoolId, User user) throws Exception {
         Config config = Utils.getConfig();
-        String url = String.format(Urls.CREATE_VENDOR_LISENCE_FEATURE_GROUPS, config.getCatalogBeHost(), config.getCatalogBePort(), vspid, versionId);
+        String url = String.format(Urls.CREATE_VENDOR_LISENCE_FEATURE_GROUPS, config.getOnboardingBeHost(), config.getOnboardingBePort(), vspid, versionId);
         String userId = user.getUserId();
 
         JSONObject jObject = new JSONObject();
@@ -209,7 +209,7 @@ public class VendorLicenseModelRestUtils {
 
     public static RestResponse createVendorEntitlementPool_3(String vspid, String versionId, User user) throws Exception {
         Config config = Utils.getConfig();
-        String url = String.format(Urls.CREATE_VENDOR_LISENCE_ENTITLEMENT_POOL, config.getCatalogBeHost(), config.getCatalogBePort(), vspid, versionId);
+        String url = String.format(Urls.CREATE_VENDOR_LISENCE_ENTITLEMENT_POOL, config.getOnboardingBeHost(), config.getOnboardingBePort(), vspid, versionId);
         String userId = user.getUserId();
 
         JSONObject jEntitlementMetricObject = new JSONObject();
@@ -249,7 +249,7 @@ public class VendorLicenseModelRestUtils {
 
     public static RestResponse createVendorKeyGroups_2(String vspid, String versionId, User user) throws Exception {
         Config config = Utils.getConfig();
-        String url = String.format(Urls.CREATE_VENDOR_LISENCE_KEY_GROUPS, config.getCatalogBeHost(), config.getCatalogBePort(), vspid, versionId);
+        String url = String.format(Urls.CREATE_VENDOR_LISENCE_KEY_GROUPS, config.getOnboardingBeHost(), config.getOnboardingBePort(), vspid, versionId);
         String userId = user.getUserId();
 
         JSONObject jOperationalScope = new JSONObject();
@@ -272,7 +272,7 @@ public class VendorLicenseModelRestUtils {
     public static RestResponse validateUpload(String vspid, User user, String vspVersion) throws Exception {
         String body = null;
         Config config = Utils.getConfig();
-        String url = String.format(Urls.VALIDATE_UPLOAD, config.getCatalogBeHost(), config.getCatalogBePort(), vspid,vspVersion);
+        String url = String.format(Urls.VALIDATE_UPLOAD, config.getOnboardingBeHost(), config.getOnboardingBePort(), vspid,vspVersion);
         String userId = user.getUserId();
 
         Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/VendorSoftwareProductRestUtils.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/VendorSoftwareProductRestUtils.java
index 51b11da1b2..51e4923a1a 100644
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/VendorSoftwareProductRestUtils.java
+++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/utils/general/VendorSoftwareProductRestUtils.java
@@ -124,7 +124,7 @@ public class VendorSoftwareProductRestUtils {
     private static RestResponse deleteArtifactByType(String componentInstanceId, VendorSoftwareProductObject vendorSoftwareProductObject, User user, CvfcTypeEnum snmpType) throws Exception
     {
         Config config = Utils.getConfig();
-        String url = String.format(Urls.DELETE_AMDOCS_ARTIFACT_BY_TYPE, config.getCatalogBeHost(), config.getCatalogBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId(), componentInstanceId, snmpType.getValue());
+        String url = String.format(Urls.DELETE_AMDOCS_ARTIFACT_BY_TYPE, config.getOnboardingBeHost(), config.getOnboardingBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId(), componentInstanceId, snmpType.getValue());
         String userId = user.getUserId();
         Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
 
@@ -196,27 +196,27 @@ public class VendorSoftwareProductRestUtils {
 
     public static RestResponse uploadCvfcArtifact(String filepath, String cvfcType, User user, VendorSoftwareProductObject vendorSoftwareProductObject, String componentInstanceId) throws IOException {
         Config config = Utils.getConfig();
-        String snmpPollUrl = String.format(Urls.UPLOAD_AMDOCS_ARTIFACT, config.getCatalogBeHost(),config.getCatalogBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId(), componentInstanceId, cvfcType);
+        String snmpPollUrl = String.format(Urls.UPLOAD_AMDOCS_ARTIFACT, config.getOnboardingBeHost(),config.getOnboardingBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId(), componentInstanceId, cvfcType);
         return uploadFile(filepath, null, snmpPollUrl, user);
     }
 
 
     private static RestResponse uploadSnmpPollArtifact(String filepath, String zipArtifact, VendorSoftwareProductObject vendorSoftwareProductObject, User user, String componentInstanceId) throws IOException {
         Config config = Utils.getConfig();
-        String snmpPollUrl = String.format(Urls.UPLOAD_SNMP_POLL_ARTIFACT, config.getCatalogBeHost(),config.getCatalogBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId(), componentInstanceId);
+        String snmpPollUrl = String.format(Urls.UPLOAD_SNMP_POLL_ARTIFACT, config.getOnboardingBeHost(),config.getOnboardingBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId(), componentInstanceId);
         return uploadFile(filepath, zipArtifact, snmpPollUrl, user);
     }
 
     private static RestResponse uploadSnmpTrapArtifact(String filepath, String zipArtifact, VendorSoftwareProductObject vendorSoftwareProductObject, User user, String vspComponentId) throws IOException {
         Config config = Utils.getConfig();
-        String snmpTrapUrl = String.format(Urls.UPLOAD_SNMP_POLL_ARTIFACT, config.getCatalogBeHost(),config.getCatalogBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId(), vspComponentId);
+        String snmpTrapUrl = String.format(Urls.UPLOAD_SNMP_POLL_ARTIFACT, config.getOnboardingBeHost(),config.getOnboardingBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId(), vspComponentId);
         return uploadFile(filepath, zipArtifact, snmpTrapUrl, user);
     }
 
     private static RestResponse deleteSnmpArtifact(String componentId, String vspId, User user, SnmpTypeEnum snmpType) throws Exception
     {
         Config config = Utils.getConfig();
-        String url = String.format(Urls.DELETE_AMDOCS_ARTIFACT_BY_TYPE, config.getCatalogBeHost(),config.getCatalogBePort(), vspId, componentId, snmpType.getValue());
+        String url = String.format(Urls.DELETE_AMDOCS_ARTIFACT_BY_TYPE, config.getOnboardingBeHost(),config.getOnboardingBePort(), vspId, componentId, snmpType.getValue());
         String userId = user.getUserId();
 
         Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
@@ -248,7 +248,7 @@ public class VendorSoftwareProductRestUtils {
 
     private static RestResponse getVSPComponents(VendorSoftwareProductObject vendorSoftwareProductObject, User user) throws Exception{
         Config config = Utils.getConfig();
-        String url = String.format(Urls.GET_VSP_COMPONENTS, config.getCatalogBeHost(),config.getCatalogBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId());
+        String url = String.format(Urls.GET_VSP_COMPONENTS, config.getOnboardingBeHost(),config.getOnboardingBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId());
         Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(user.getUserId());
 
         HttpRequest http = new HttpRequest();
@@ -267,7 +267,7 @@ public class VendorSoftwareProductRestUtils {
 
     private static RestResponse getVSPComponentByVersion(VendorSoftwareProductObject vendorSoftwareProductObject, User user) throws Exception{
         Config config = Utils.getConfig();
-        String url = String.format(Urls.GET_VSP_COMPONENT_BY_VERSION, config.getCatalogBeHost(),config.getCatalogBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId());
+        String url = String.format(Urls.GET_VSP_COMPONENT_BY_VERSION, config.getOnboardingBeHost(),config.getOnboardingBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId());
         String userId = user.getUserId();
 
         Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
@@ -279,7 +279,7 @@ public class VendorSoftwareProductRestUtils {
 
     private static RestResponse actionOnComponent(String vspid, String body, String onboardComponent, User user, String componentVersion) throws Exception {
         Config config = Utils.getConfig();
-        String url = String.format(Urls.ACTION_ON_COMPONENT, config.getCatalogBeHost(), config.getCatalogBePort(), onboardComponent, vspid, componentVersion);
+        String url = String.format(Urls.ACTION_ON_COMPONENT, config.getOnboardingBeHost(), config.getOnboardingBePort(), onboardComponent, vspid, componentVersion);
         String userId = user.getUserId();
         Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
 
@@ -291,7 +291,7 @@ public class VendorSoftwareProductRestUtils {
     public static Pair<RestResponse, VendorSoftwareProductObject> createNewVendorSoftwareProduct(ResourceReqDetails resourceReqDetails, String vspName, AmdocsLicenseMembers amdocsLicenseMembers, User user) throws Exception {
 
         Config config = Utils.getConfig();
-        String url = String.format(Urls.CREATE_VENDOR_SOFTWARE_PRODUCT, config.getCatalogBeHost(), config.getCatalogBePort());
+        String url = String.format(Urls.CREATE_VENDOR_SOFTWARE_PRODUCT, config.getOnboardingBeHost(), config.getOnboardingBePort());
         String userId = user.getUserId();
         VendorSoftwareProductObject vendorSoftwareProductObject = new VendorSoftwareProductObject();
         LicensingData licensingData = new LicensingData(amdocsLicenseMembers.getVendorLicenseAgreementId(), Arrays.asList(amdocsLicenseMembers.getFeatureGroupId()));
@@ -324,7 +324,7 @@ public class VendorSoftwareProductRestUtils {
 
     public static RestResponse validateUpload(VendorSoftwareProductObject vendorSoftwareProductObject, User user) throws Exception {
         Config config = Utils.getConfig();
-        String url = String.format(Urls.VALIDATE_UPLOAD, config.getCatalogBeHost(), config.getCatalogBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId());
+        String url = String.format(Urls.VALIDATE_UPLOAD, config.getOnboardingBeHost(), config.getOnboardingBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId());
         String userId = user.getUserId();
 
         Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
@@ -336,7 +336,7 @@ public class VendorSoftwareProductRestUtils {
 
     public static RestResponse uploadHeatPackage(String filepath, String filename, VendorSoftwareProductObject vendorSoftwareProductObject, User user) throws Exception {
         Config config = Utils.getConfig();
-        String url = String.format(Urls.UPLOAD_HEAT_PACKAGE, config.getCatalogBeHost(), config.getCatalogBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId());
+        String url = String.format(Urls.UPLOAD_HEAT_PACKAGE, config.getOnboardingBeHost(), config.getOnboardingBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId());
         return uploadFile(filepath, filename, url, user);
     }
 
@@ -421,7 +421,7 @@ public class VendorSoftwareProductRestUtils {
 
     public static RestResponse checkinVendorSoftwareProduct(User user, VendorSoftwareProductObject vendorSoftwareProductObject) throws Exception {
         Config config = Utils.getConfig();
-        String url = String.format(Urls.UPDATE_VSP, config.getCatalogBeHost(), config.getCatalogBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId());
+        String url = String.format(Urls.UPDATE_VSP, config.getOnboardingBeHost(), config.getOnboardingBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId());
 
         String userId = user.getUserId();
         Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
@@ -467,7 +467,7 @@ public class VendorSoftwareProductRestUtils {
 
     private static RestResponse createMethodVendorSoftwareProduct(VendorSoftwareProductObject vendorSoftwareProductObject, String body, String onboardComponent, User user) throws Exception {
         Config config = Utils.getConfig();
-        String url = String.format(Urls.CREATE_METHOD, config.getCatalogBeHost(), config.getCatalogBePort(), onboardComponent, vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId());
+        String url = String.format(Urls.CREATE_METHOD, config.getOnboardingBeHost(), config.getOnboardingBePort(), onboardComponent, vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId());
         String userId = user.getUserId();
         Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
 
@@ -511,7 +511,7 @@ public class VendorSoftwareProductRestUtils {
     public static RestResponse updateVendorSoftwareProduct(VendorSoftwareProductObject vendorSoftwareProductObject, String body, User user) throws Exception {
 
         Config config = Utils.getConfig();
-        String url = String.format(Urls.UPDATE_VSP, config.getCatalogBeHost(), config.getCatalogBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId());
+        String url = String.format(Urls.UPDATE_VSP, config.getOnboardingBeHost(), config.getOnboardingBePort(), vendorSoftwareProductObject.getVspId(), vendorSoftwareProductObject.getComponentId());
         String userId = user.getUserId();
 
         Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);