Sync Integ to Master

[sdc.git] / test-apis-ci / src / main / java / org / openecomp / sdc / ci / tests / utils / general / OnboardingUtillViaApis.java

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 76e4c51..8637a9b 100644 (file)
--- 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
@@ -30,15 +30,17 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import com.aventstack.extentreports.Status;
+import com.clearspring.analytics.util.Pair;
+import com.google.gson.Gson;
+import fj.data.Either;
 
 import org.apache.commons.codec.binary.Base64;
 import org.openecomp.sdc.be.model.Component;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
-import org.openecomp.sdc.ci.tests.api.ExtentTestActions;
 import org.openecomp.sdc.ci.tests.api.Urls;
 import org.openecomp.sdc.ci.tests.config.Config;
 import org.openecomp.sdc.ci.tests.datatypes.AmdocsLicenseMembers;
@@ -53,7 +55,6 @@ import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse;
 import org.openecomp.sdc.ci.tests.utils.Utils;
 import org.openecomp.sdc.ci.tests.utils.rest.BaseRestUtils;
 
-import com.aventstack.extentreports.Status;
 import com.clearspring.analytics.util.Pair;
 import com.google.gson.Gson;
 
@@ -61,28 +62,28 @@ import fj.data.Either;
 
 public class OnboardingUtillViaApis {
 
-       protected static Map<String, String> prepareHeadersMap(String userId) {
-               Map<String, String> headersMap = new HashMap<String, String>();
-               headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), "application/json");
-               headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), "application/json");
-               headersMap.put(HttpHeaderEnum.USER_ID.getValue(), userId);
-               return headersMap;
-       }
-       
+//     protected static Map<String, String> prepareHeadersMap(String userId) {
+//             Map<String, String> headersMap = new HashMap<String, String>();
+//             headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), "application/json");
+//             headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), "application/json");
+//             headersMap.put(HttpHeaderEnum.USER_ID.getValue(), userId);
+//             return headersMap;
+//     }
+
        public static Pair<String, VendorSoftwareProductObject> createVspViaApis(ResourceReqDetails resourceReqDetails, String filepath, String vnfFile, User user) throws Exception {
 
                VendorSoftwareProductObject vendorSoftwareProductObject = new VendorSoftwareProductObject();
-               ExtentTestActions.log(Status.INFO, String.format("Create Vendor License"));
-               AmdocsLicenseMembers amdocsLicenseMembers = OnboardingUtils.createVendorLicense(user);
-               Pair<String, Map<String, String>> createVendorSoftwareProduct = OnboardingUtils.createVendorSoftwareProduct(resourceReqDetails, vnfFile, filepath, user, amdocsLicenseMembers);
-               Map<String, String> map = createVendorSoftwareProduct.right;
-               vendorSoftwareProductObject.setAttContact(map.get("attContact"));
-               vendorSoftwareProductObject.setCategory(map.get("category"));
-               vendorSoftwareProductObject.setComponentId(map.get("componentId"));
-               vendorSoftwareProductObject.setDescription(map.get("description"));
-               vendorSoftwareProductObject.setSubCategory(map.get("subCategory"));
-               vendorSoftwareProductObject.setVendorName(map.get("vendorName"));
-               vendorSoftwareProductObject.setVspId(map.get("vspId"));
+
+               AmdocsLicenseMembers amdocsLicenseMembers = VendorLicenseModelRestUtils.createVendorLicense(user);
+               Pair<String, VendorSoftwareProductObject> createVendorSoftwareProduct = VendorSoftwareProductRestUtils.createVendorSoftwareProduct(resourceReqDetails, vnfFile, filepath, user, amdocsLicenseMembers);
+               VendorSoftwareProductObject map = createVendorSoftwareProduct.right;
+               vendorSoftwareProductObject.setAttContact(map.getAttContact());
+               vendorSoftwareProductObject.setCategory(map.getCategory());
+               vendorSoftwareProductObject.setComponentId(map.getComponentId());
+               vendorSoftwareProductObject.setDescription(map.getDescription());
+               vendorSoftwareProductObject.setSubCategory(map.getSubCategory());
+               vendorSoftwareProductObject.setVendorName(map.getVendorName());
+               vendorSoftwareProductObject.setVspId(map.getVspId());
                Pair<String, VendorSoftwareProductObject> pair = new Pair<String, VendorSoftwareProductObject>(createVendorSoftwareProduct.left, vendorSoftwareProductObject);
                return pair;
        }
@@ -109,18 +110,18 @@ public class OnboardingUtillViaApis {
                
                return resource; 
        }*/
-
-       public static Resource createResourceFromVSP(ResourceReqDetails resourceDetails, UserRoleEnum user) throws Exception {
-               Resource resource = AtomicOperationUtils.createResourceByResourceDetails(resourceDetails, user, true).left().value();
-
-               return resource;
-       }
-
        public static Resource createResourceFromVSP(ResourceReqDetails resourceDetails) throws Exception {
                Resource resource = AtomicOperationUtils.createResourceByResourceDetails(resourceDetails, UserRoleEnum.DESIGNER, true).left().value();
-               
                return resource;
+
        }
+       
+       public static Resource createResourceFromVSP(ResourceReqDetails resourceDetails, UserRoleEnum userRole) throws Exception {
+               Resource resource = AtomicOperationUtils.createResourceByResourceDetails(resourceDetails, userRole, true).left().value();
+               return resource;
+
+       }
+       
        public static void downloadToscaCsarToDirectory(Component component, File file) {
                try {
                        Either<String, RestResponse> componentToscaArtifactPayload = AtomicOperationUtils.getComponenetArtifactPayload(component, "assettoscacsar");
@@ -236,7 +237,7 @@ public class OnboardingUtillViaApis {
                Config config = Utils.getConfig();
                String url = String.format(Urls.GET_VENDOR_SOFTWARE_PRODUCT, config.getCatalogBeHost(), config.getCatalogBePort(), vspId);
                String userId = user.getUserId();
-               Map<String, String> headersMap = prepareHeadersMap(userId);
+               Map<String, String> headersMap = OnboardingUtils.prepareHeadersMap(userId);
                headersMap.put(HttpHeaderEnum.X_ECOMP_REQUEST_ID_HEADER.getValue(), "123456");
                headersMap.put(HttpHeaderEnum.ACCEPT.getValue(), "*/*");
                headersMap.put("Accept-Encoding", "gzip, deflate, br");