diff options
Diffstat (limited to 'ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/OnboardingUiUtils.java')
| -rw-r--r-- | ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/OnboardingUiUtils.java | 969 |
1 files changed, 969 insertions, 0 deletions
diff --git a/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/OnboardingUiUtils.java b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/OnboardingUiUtils.java new file mode 100644 index 0000000000..b610cf1c54 --- /dev/null +++ b/ui-ci/src/main/java/org/openecomp/sdc/ci/tests/utilities/OnboardingUiUtils.java @@ -0,0 +1,969 @@ +/*- + * ============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 + * + * 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========================================================= + */ + +package org.openecomp.sdc.ci.tests.utilities; + +import static org.testng.AssertJUnit.assertEquals; + +import java.io.File; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +import org.openecomp.sdc.be.model.User; +import org.openecomp.sdc.ci.tests.datatypes.AmdocsLicenseMembers; +import org.openecomp.sdc.ci.tests.datatypes.DataTestIdEnum; +import org.openecomp.sdc.ci.tests.datatypes.HeatMetaFirstLevelDefinition; +import org.openecomp.sdc.ci.tests.datatypes.LifeCycleStateEnum; +import org.openecomp.sdc.ci.tests.datatypes.ResourceReqDetails; +import org.openecomp.sdc.ci.tests.datatypes.http.RestResponse; +import org.openecomp.sdc.ci.tests.execute.devCI.ArtifactFromCsar; +import org.openecomp.sdc.ci.tests.execute.setup.ArtifactsCorrelationManager; +import org.openecomp.sdc.ci.tests.execute.setup.ExtentTestActions; +import org.openecomp.sdc.ci.tests.execute.setup.SetupCDTest; +import org.openecomp.sdc.ci.tests.pages.DeploymentArtifactPage; +import org.openecomp.sdc.ci.tests.pages.HomePage; +import org.openecomp.sdc.ci.tests.pages.ResourceGeneralPage; +import org.openecomp.sdc.ci.tests.utils.general.OnboardingUtils; +import org.openecomp.sdc.ci.tests.utils.rest.ResponseParser; +import org.openecomp.sdc.ci.tests.verificator.VfVerificator; +import org.openqa.selenium.WebElement; +import org.testng.Assert; + +import com.aventstack.extentreports.Status; +import com.clearspring.analytics.util.Pair; + + + + + + + + + +public class OnboardingUiUtils { + +// /** +// * excluded VNF file list +// */ +// protected static List<String> exludeVnfList = +//// new ArrayList<String>(); +// +// Arrays.asList( +// +//// new VNFs +// "Vhss-epc-rdm3-lab-vf-0921-v2.0-MOBILITY-10-20.zip", "Apndns-1710-vf-v3.0-10-20.zip", +// "HeatCandidate_2017-09-22_01-48_55Name_2016-182-asbg-nsbg-tsbg-v1.0-(VOIP).zip", "HeatCandidate_2017-09-22_01-47_55Name_2016-182-asbg-nsbg-tsbg-v7.0-(VOIP).zip", +// "Efmc-dbe-nin-v24.0-VOIP-10-20.zip", "VF_LMSP_v5-062317-V3.0-(Mobility).zip", "base_bwks_nfm_volume-236262502.zip", +// +//// newest failed VNFs +// "HeatCandidate_2017-09-20_15-07_66Name_2016-20-visbc1vf-v4.0-(VOIP).zip", +// "HeatCandidate_2017-09-20_15-06_66Name_2016-20-visbc1vf-v6.0-(VOIP).zip", "1-Vf-zrdm5bpxtc02-092017-(MOBILITY)_v3.0.zip", +// "2-Vf-zrdm5bpxtc02-092017-(MOBILITY)_v2.0.zip", "1-2017-491-4vshaken-HTTP-CM-vf-(VOIP)_v2.0.zip" +// +// ); +// +// /** +// * additional files to exludeVnfList files for tosca parser tests +// */ +// protected static List<String> exludeVnfListForToscaParser = new ArrayList<String>(); +// //Arrays.asList("2016-043_vsaegw_fdnt_30_1607_e2e.zip", "vIRC_CC.zip", +//// "2016-045_vlb_lmsp_30_1607_e2e.zip", "2016-050_vdns_vmdns_30_1607_e2e.zip", +//// "2016-247_mns_mns_30_1610_e2e.zip", "2016-044_vfw_fcgi_30_1607_e2e.zip"); + + public OnboardingUiUtils() { + } + +// public static Pair<String, Map<String, String>> createVendorSoftwareProduct(ResourceReqDetails resourceReqDetails, String heatFileName, String filepath, User user, AmdocsLicenseMembers amdocsLicenseMembers, Map<CvfcTypeEnum, String> cvfcArtifacts) +// throws Exception { +// +// Pair<String, Map<String, String>> pair = createVSP(resourceReqDetails, heatFileName, filepath, user, amdocsLicenseMembers); +// String vspid = pair.right.get("vspId"); +// if(cvfcArtifacts != null && ! cvfcArtifacts.isEmpty()){ +// OnboardingUiUtils.addCvfcArtifacts(cvfcArtifacts, vspid, user, null); +// +// } +// prepareVspForUse(user, vspid, "0.1"); +// return pair; +// } + + public static void prepareVspForUse(User user, String vspid, String vspVersion) throws Exception { + + RestResponse checkin = OnboardingUtils.checkinVendorSoftwareProduct(vspid, user, vspVersion); + assertEquals("did not succeed to checking new VSP", 200, checkin.getErrorCode().intValue()); + + RestResponse submit = OnboardingUtils.submitVendorSoftwareProduct(vspid, user, vspVersion); + assertEquals("did not succeed to submit new VSP", 200, submit.getErrorCode().intValue()); + + RestResponse createPackage = OnboardingUtils.createPackageOfVendorSoftwareProduct(vspid, user, vspVersion); + assertEquals("did not succeed to create package of new VSP ", 200, createPackage.getErrorCode().intValue()); + if(SetupCDTest.getExtendTest() != null){ + SetupCDTest.getExtendTest().log(Status.INFO, "Succeeded in creating the vendor software product"); + } + } + + +// public static VendorSoftwareProductObject createAndFillVendorSoftwareProduct(ResourceReqDetails resourceReqDetails, String heatFileName, String filePath, User user, AmdocsLicenseMembers amdocsLicenseMembers, Map<CvfcTypeEnum, String> cvfcArtifacts) +// throws Exception { +// +// Pair<String, Map<String, String>> createVendorSoftwareProduct = OnboardingUiUtils.createVendorSoftwareProduct(resourceReqDetails, heatFileName, filePath, user, amdocsLicenseMembers, cvfcArtifacts); +// VendorSoftwareProductObject vendorSoftwareProductObject = OnboardViaApis.fillVendorSoftwareProductObjectWithMetaData(heatFileName, createVendorSoftwareProduct); +// return vendorSoftwareProductObject; +// +// } + +// public static Pair<String, Map<String, String>> createVendorSoftwareProduct(ResourceReqDetails resourceReqDetails, String heatFileName, String filepath, User user, AmdocsLicenseMembers amdocsLicenseMembers) +// throws Exception { +// +// Map<CvfcTypeEnum, String> cvfcArtifacts = new HashMap<>(); +// return createVendorSoftwareProduct(resourceReqDetails, heatFileName, filepath, user, amdocsLicenseMembers, cvfcArtifacts); +// } + +// public static Pair<String, Map<String, String>> createVSP(ResourceReqDetails resourceReqDetails, String heatFileName, String filepath, User user, AmdocsLicenseMembers amdocsLicenseMembers) throws Exception { +// String vspName = handleFilename(heatFileName); +// +// if(SetupCDTest.getExtendTest() != null){ +// SetupCDTest.getExtendTest().log(Status.INFO, "Starting to create the vendor software product"); +// } +// +// Pair<RestResponse, Map<String, String>> createNewVspPair = createNewVendorSoftwareProduct(resourceReqDetails, vspName, amdocsLicenseMembers, user); +// RestResponse createNewVendorSoftwareProduct = createNewVspPair.left; +// assertEquals("did not succeed to create new VSP", 200,createNewVendorSoftwareProduct.getErrorCode().intValue()); +// String vspid = ResponseParser.getValueFromJsonResponse(createNewVendorSoftwareProduct.getResponse(), "vspId"); +// String componentId = ResponseParser.getValueFromJsonResponse(createNewVendorSoftwareProduct.getResponse(), "componentId"); +// +// Map<String, String> vspMeta = createNewVspPair.right; +// Map<String, String> vspObject = new HashMap<String, String>(); +// Iterator<String> iterator = vspMeta.keySet().iterator(); +// while(iterator.hasNext()){ +// Object key = iterator.next(); +// Object value = vspMeta.get(key); +// vspObject.put(key.toString(), value.toString()); +// } +// vspObject.put("vspId", vspid); +// vspObject.put("componentId", componentId); +// vspObject.put("vendorName", amdocsLicenseMembers.getVendorLicenseName()); +// vspObject.put("attContact", user.getUserId()); +// +// RestResponse uploadHeatPackage = uploadHeatPackage(filepath, heatFileName, vspid, user, "0.1"); +// assertEquals("did not succeed to upload HEAT package", 200, uploadHeatPackage.getErrorCode().intValue()); +// +// RestResponse validateUpload = validateUpload(vspid, user, "0.1"); +// assertEquals("did not succeed to validate upload process, reason: " + validateUpload.getResponse(), 200, validateUpload.getErrorCode().intValue()); +// +// Pair<String, Map<String, String>> pair = new Pair<String, Map<String, String>>(vspName, vspObject); +// +// return pair; +// } + +// public static void updateVspWithVfcArtifacts(String filepath, String vspId, String updatedSnmpPoll, String updatedSnmpTrap, String componentId, User user, String vspVersion) throws Exception{ +// RestResponse checkout = checkoutVendorSoftwareProduct(vspId, user, vspVersion); +// assertEquals("did not succeed to checkout new VSP", 200, checkout.getErrorCode().intValue()); +// ExtentTestActions.log(Status.INFO, "Deleting SNMP POLL"); +// deleteArtifactByType(componentId, vspId, user, CvfcTypeEnum.SNMP_POLL); +// ExtentTestActions.log(Status.INFO, "Deleting SNMP TRAP"); +// deleteArtifactByType(componentId, vspId, user, CvfcTypeEnum.SNMP_TRAP); +// addVFCArtifacts(filepath, updatedSnmpPoll, updatedSnmpTrap, vspId, user, componentId); +// prepareVspForUse(user, vspId, vspVersion); +// } + + public static String updateVendorSoftwareProduct(String vspId, String HeatFileName, String filepath, User user, String vspVersion) + throws Exception, Throwable { + String vspName = OnboardingUtils.handleFilename(HeatFileName); + SetupCDTest.getExtendTest().log(Status.INFO, "Starting to update the vendor software product"); + + RestResponse checkout = OnboardingUtils.checkoutVendorSoftwareProduct(vspId, user, vspVersion); + assertEquals("did not succeed to checkout new VSP", 200, checkout.getErrorCode().intValue()); + + RestResponse uploadHeatPackage = OnboardingUtils.uploadHeatPackage(filepath, HeatFileName, vspId, user, vspVersion); + assertEquals("did not succeed to upload HEAT package", 200, uploadHeatPackage.getErrorCode().intValue()); + + RestResponse validateUpload = OnboardingUtils.validateUpload(vspId, user, vspVersion); + assertEquals("did not succeed to validate upload process", 200, validateUpload.getErrorCode().intValue()); + + RestResponse checkin = OnboardingUtils.checkinVendorSoftwareProduct(vspId, user, vspVersion); + assertEquals("did not succeed to checking VSP", 200, checkin.getErrorCode().intValue()); + + RestResponse submit = OnboardingUtils.submitVendorSoftwareProduct(vspId, user, vspVersion); + assertEquals("did not succeed to submit VSP", 200, submit.getErrorCode().intValue()); + + RestResponse createPackage = OnboardingUtils.createPackageOfVendorSoftwareProduct(vspId, user, vspVersion); + assertEquals("did not succeed to update package of VSP ", 200, createPackage.getErrorCode().intValue()); + + SetupCDTest.getExtendTest().log(Status.INFO, "Succeeded in updating the vendor software product"); + + return vspName; + } + +// public static void updateVendorSoftwareProductToNextVersion(VendorSoftwareProductObject vendorSoftwareProductObject, String toVspVersion, User user) +// throws Exception, Throwable { +// +// RestResponse checkout = checkoutVendorSoftwareProduct(vendorSoftwareProductObject.getVspId(), user, vendorSoftwareProductObject.getVersion()); +// assertEquals("did not succeed to checkout new VSP", 200, checkout.getErrorCode().intValue()); +// +// RestResponse checkin = checkinVendorSoftwareProduct(vendorSoftwareProductObject.getVspId(), user, vendorSoftwareProductObject.getVersion()); +// assertEquals("did not succeed to checking VSP", 200, checkin.getErrorCode().intValue()); +// +// RestResponse submit = submitVendorSoftwareProduct(vendorSoftwareProductObject.getVspId(), user, vendorSoftwareProductObject.getVersion()); +// assertEquals("did not succeed to submit VSP", 200, submit.getErrorCode().intValue()); +// +// vendorSoftwareProductObject.setVersion(toVspVersion); +// } + +// public static String handleFilename(String heatFileName) { +// final String namePrefix = String.format("%sVFOnboarded-", ElementFactory.getResourcePrefix()); +// final String nameSuffix = "-" + getShortUUID(); +// +// String subHeatFileName = heatFileName.substring(0, heatFileName.lastIndexOf(".")); +// +// if ((namePrefix + subHeatFileName + nameSuffix).length() >= 50) { +// subHeatFileName = subHeatFileName.substring(0, 50 - namePrefix.length() - nameSuffix.length()); +// } +// +// if (subHeatFileName.contains("(") || subHeatFileName.contains(")")) { +// subHeatFileName = subHeatFileName.replace("(", "-"); +// subHeatFileName = subHeatFileName.replace(")", "-"); +// } +// +// String vnfName = namePrefix + subHeatFileName + nameSuffix; +// return vnfName; +// } + +// public static String addVFCArtifacts(String filepath, String snmpPoll, String snmpTrap, String vspid, User user, String vspComponentId) throws Exception{ +// vspComponentId = (vspComponentId == null) ? getVSPComponentId(vspid, user) : vspComponentId; +// if (vspComponentId != null){ +// if (snmpPoll != null){ +// ExtentTestActions.log(Status.INFO, "Adding VFC artifact of type SNMP POLL with the file " + snmpPoll); +// RestResponse uploadSnmpPollArtifact = uploadSnmpPollArtifact(filepath, snmpPoll, vspid, user, vspComponentId); +// assertEquals("Did not succeed to add SNMP POLL", 200, uploadSnmpPollArtifact.getErrorCode().intValue()); +// } +// if (snmpTrap != null){ +// ExtentTestActions.log(Status.INFO, "Adding VFC artifact of type SNMP TRAP with the file " + snmpTrap); +// RestResponse uploadSnmpTrapArtifact = uploadSnmpTrapArtifact(filepath, snmpTrap, vspid, user, vspComponentId); +// assertEquals("Did not succeed to add SNMP TRAP", 200, uploadSnmpTrapArtifact.getErrorCode().intValue()); +// } +// } +// +// return vspComponentId; +// } + +// public static String addCvfcArtifacts(Map<CvfcTypeEnum, String> componentVfcArtifacts, String vspid, User user, String vspComponentId) throws Exception{ +// vspComponentId = (vspComponentId == null) ? getVSPComponentId(vspid, user) : vspComponentId; +// if (vspComponentId != null){ +// for(Entry<CvfcTypeEnum, String> entry : componentVfcArtifacts.entrySet()){ +// ExtentTestActions.log(Status.INFO, "Adding VFC artifact of type " + entry.getKey().getValue() + " with the file " + entry.getValue()); +// RestResponse uploadSnmpPollArtifact = uploadCvfcArtifact(entry.getValue(), entry.getKey().getValue(), vspid, user, vspComponentId); +// assertEquals("Did not succeed to add " + entry.getKey().getValue(), BaseRestUtils.STATUS_CODE_SUCCESS, uploadSnmpPollArtifact.getErrorCode().intValue()); +// } +// } +// return vspComponentId; +// } + +// public static String addVFCArtifacts(String filepath, String snmpPoll, String snmpTrap, String vspid, User user) throws Exception{ +// return addVFCArtifacts(filepath, snmpPoll, snmpTrap, vspid, user, null); +// } + +// public static RestResponse uploadCvfcArtifact(String filepath, String cvfcType, String vspid, User user, String vspComponentId) throws FileNotFoundException, IOException, ClientProtocolException { +// Config config = Utils.getConfig(); +// String snmpPollUrl = String.format(Urls.UPLOAD_AMDOCS_ARTIFACT, config.getCatalogBeHost(),config.getCatalogBePort(), vspid, vspComponentId, cvfcType); +// return uploadFile(filepath, null, snmpPollUrl, user); +// } + +// private static RestResponse uploadSnmpPollArtifact(String filepath, String zipArtifact, String vspid, User user, +// String vspComponentId) throws FileNotFoundException, IOException, ClientProtocolException { +// Config config = Utils.getConfig(); +// String snmpPollUrl = String.format(Urls.UPLOAD_SNMP_POLL_ARTIFACT, config.getCatalogBeHost(),config.getCatalogBePort(), vspid, vspComponentId); +// return uploadFile(filepath, zipArtifact, snmpPollUrl, user); +// } + +// private static RestResponse uploadSnmpTrapArtifact(String filepath, String zipArtifact, String vspid, User user, +// String vspComponentId) throws FileNotFoundException, IOException, ClientProtocolException { +// Config config = Utils.getConfig(); +// String snmpTrapUrl = String.format(Urls.UPLOAD_SNMP_POLL_ARTIFACT, config.getCatalogBeHost(),config.getCatalogBePort(), vspid, vspComponentId); +// return uploadFile(filepath, zipArtifact, snmpTrapUrl, user); +// } + +// private static RestResponse deleteArtifactByType(String componentId, String vspId, User user, CvfcTypeEnum 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 userId = user.getUserId(); +// Map<String, String> headersMap = prepareHeadersMap(userId); +// +// HttpRequest http = new HttpRequest(); +// RestResponse response = http.httpSendDelete(url, headersMap); +// return response; +// } + +// private static String getVSPComponentId(String vspid, User user) throws Exception, JSONException { +// RestResponse components = getVSPComponents(vspid, user); +// String response = components.getResponse(); +// Map<String, Object> responseMap = (Map<String, Object>) JSONValue.parse(response); +// JSONArray results = (JSONArray)responseMap.get("results"); +// for (Object res : results){ +// Map<String, Object> compMap= (Map<String, Object>) JSONValue.parse(res.toString()); +// String componentId = compMap.get("id").toString(); +// return componentId; +// } +// return null; +// } + +// private static RestResponse getVSPComponents(String vspid, User user) throws Exception{ +// Config config = Utils.getConfig(); +// String url = String.format(Urls.GET_VSP_COMPONENTS, config.getCatalogBeHost(),config.getCatalogBePort(), vspid); +// String userId = user.getUserId(); +// +// Map<String, String> headersMap = prepareHeadersMap(userId); +// +// HttpRequest http = new HttpRequest(); +// RestResponse response = http.httpSendGet(url, headersMap); +// return response; +// } + +// private static RestResponse getVSPComponentByVersion(String vspId, String vspVersion, User user) throws Exception{ +// Config config = Utils.getConfig(); +// String url = String.format(Urls.GET_VSP_COMPONENT_BY_VERSION, config.getCatalogBeHost(),config.getCatalogBePort(), vspId,vspVersion); +// String userId = user.getUserId(); +// +// Map<String, String> headersMap = prepareHeadersMap(userId); +// +// HttpRequest http = new HttpRequest(); +// RestResponse response = http.httpSendGet(url, headersMap); +// return response; +// } + +// 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 userId = user.getUserId(); +// +// Map<String, String> headersMap = prepareHeadersMap(userId); +// +// HttpRequest http = new HttpRequest(); +// RestResponse response = http.httpSendGet(url, headersMap); +// return response; +// } + +// public static boolean validateVspExist(String vspId, String vspVersion, User user) throws Exception { +// RestResponse restResponse = getVSPComponentByVersion(vspId, vspVersion, user); +// assertEquals(String.format("Vsp version not updated, reponse message: %s", restResponse.getResponse()),restResponse.getErrorCode().intValue(),200); +// return (restResponse.getErrorCode()==200); +// } +// +// public static boolean validateVlmExist(String vlmId, String vlmVersion, User user) throws Exception { +// RestResponse restResponse = getVLMComponentByVersion(vlmId, vlmVersion, user); +// assertEquals(String.format("VLM version not updated, reponse code message: %s", restResponse.getResponse()),restResponse.getErrorCode().intValue(),200); +// return (restResponse.getErrorCode()==200); +// } + + public static AmdocsLicenseMembers createVendorLicense(User user) throws Exception { + + AmdocsLicenseMembers amdocsLicenseMembers; + if(SetupCDTest.getExtendTest() != null){ + SetupCDTest.getExtendTest().log(Status.INFO, "Starting to create the vendor license"); + } + String vendorLicenseName = "ciLicense" + OnboardingUtils.getShortUUID(); + RestResponse vendorLicenseResponse = OnboardingUtils.createVendorLicenseModels_1(vendorLicenseName, user); + assertEquals("did not succeed to create vendor license model", 200, vendorLicenseResponse.getErrorCode().intValue()); + String vendorId = ResponseParser.getValueFromJsonResponse(vendorLicenseResponse.getResponse(), "value"); + + RestResponse vendorKeyGroupsResponse = OnboardingUtils.createVendorKeyGroups_2(vendorId, user); + assertEquals("did not succeed to create vendor key groups", 200, vendorKeyGroupsResponse.getErrorCode().intValue()); + String keyGroupId = ResponseParser.getValueFromJsonResponse(vendorKeyGroupsResponse.getResponse(), "value"); + + RestResponse vendorEntitlementPool = OnboardingUtils.createVendorEntitlementPool_3(vendorId, user); + assertEquals("did not succeed to create vendor entitlement pool", 200, vendorEntitlementPool.getErrorCode().intValue()); + String entitlementPoolId = ResponseParser.getValueFromJsonResponse(vendorEntitlementPool.getResponse(), "value"); + + RestResponse vendorLicenseFeatureGroups = OnboardingUtils.createVendorLicenseFeatureGroups_4(vendorId, keyGroupId, entitlementPoolId, user); + assertEquals("did not succeed to create vendor license feature groups", 200, vendorLicenseFeatureGroups.getErrorCode().intValue()); + String featureGroupId = ResponseParser.getValueFromJsonResponse(vendorLicenseFeatureGroups.getResponse(), "value"); + + RestResponse vendorLicenseAgreement = OnboardingUtils.createVendorLicenseAgreement_5(vendorId, featureGroupId, user); + assertEquals("did not succeed to create vendor license agreement", 200, vendorLicenseAgreement.getErrorCode().intValue()); + String vendorLicenseAgreementId = ResponseParser.getValueFromJsonResponse(vendorLicenseAgreement.getResponse(), "value"); + + RestResponse checkinVendorLicense = OnboardingUtils.checkinVendorLicense(vendorId, user, "0.1"); + assertEquals("did not succeed to checkin vendor license", 200, checkinVendorLicense.getErrorCode().intValue()); + + RestResponse submitVendorLicense = OnboardingUtils.submitVendorLicense(vendorId, user, "0.1"); + assertEquals("did not succeed to submit vendor license", 200, submitVendorLicense.getErrorCode().intValue()); + + if(SetupCDTest.getExtendTest() != null){ + SetupCDTest.getExtendTest().log(Status.INFO, "Succeeded in creating the vendor license"); + } + + amdocsLicenseMembers = new AmdocsLicenseMembers(vendorId, vendorLicenseName, vendorLicenseAgreementId, featureGroupId); + amdocsLicenseMembers.setVersion("1.0"); // Once object created and submitted, his initial version is 1.0 + + return amdocsLicenseMembers; + } + +// public static void updateVendorLicense(AmdocsLicenseMembers amdocsLicenseMembers, User user, String vlmVersion) throws Exception { +// +// RestResponse checkoutVendorLicense = checkoutVendorLicense(amdocsLicenseMembers.getVendorId(), user, vlmVersion); +// assertEquals("did not succeed to checkout vendor license", 200, checkoutVendorLicense.getErrorCode().intValue()); +// +// RestResponse checkinVendorLicense = checkinVendorLicense(amdocsLicenseMembers.getVendorId(), user, vlmVersion); +// assertEquals("did not succeed to checkin vendor license", 200, checkinVendorLicense.getErrorCode().intValue()); +// +// RestResponse submitVendorLicense = submitVendorLicense(amdocsLicenseMembers.getVendorId(), user, vlmVersion); +// assertEquals("did not succeed to submit vendor license", 200, submitVendorLicense.getErrorCode().intValue()); +// +// if(SetupCDTest.getExtendTest() != null){ +// SetupCDTest.getExtendTest().log(Status.INFO, "Succeeded in updating the vendor license"); +// } +// } + + +// private static String getShortUUID() { +// return UUID.randomUUID().toString().split("-")[0]; +// } + +// private static RestResponse actionOnComponent(String vspid, String action, 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 userId = user.getUserId(); +// +// JSONObject jObject = new JSONObject(); +// jObject.put("action", action); +// +// Map<String, String> headersMap = prepareHeadersMap(userId); +// +// HttpRequest http = new HttpRequest(); +// RestResponse response = http.httpSendPut(url, jObject.toString(), headersMap); +// return response; +// } + +// public static RestResponse checkinVendorLicense(String vspid, User user, String vlmVersion) throws Exception { +// return actionOnComponent(vspid, "Checkin", "vendor-license-models", user, vlmVersion); +// } +// +// public static RestResponse checkoutVendorLicense(String vspid, User user, String vlmVersion) throws Exception { +// return actionOnComponent(vspid, "Checkout", "vendor-license-models", user, vlmVersion); +// } +// +// public static RestResponse submitVendorLicense(String vspid, User user, String vlmVersion) throws Exception { +// return actionOnComponent(vspid, "Submit", "vendor-license-models", user, vlmVersion); +// } + +// 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 userId = user.getUserId(); +// +// JSONObject jObject = new JSONObject(); +// jObject.put("vendorName", name); +// jObject.put("description", "new vendor license model"); +// jObject.put("iconRef", "icon"); +// +// Map<String, String> headersMap = prepareHeadersMap(userId); +// +// HttpRequest http = new HttpRequest(); +// RestResponse response = http.httpSendPost(url, jObject.toString(), headersMap); +// return response; +// +// } +// +// public static RestResponse createVendorLicenseAgreement_5(String vspid, String featureGroupId, User user) +// throws Exception { +// Config config = Utils.getConfig(); +// String url = String.format(Urls.CREATE_VENDOR_LISENCE_AGREEMENT, config.getCatalogBeHost(), config.getCatalogBePort(), vspid); +// String userId = user.getUserId(); +// +// JSONObject licenseTermpObject = new JSONObject(); +// licenseTermpObject.put("choice", "Fixed_Term"); +// licenseTermpObject.put("other", ""); +// +// JSONObject jObjectBody = new JSONObject(); +// jObjectBody.put("name", "abc"); +// jObjectBody.put("description", "new vendor license agreement"); +// jObjectBody.put("requirementsAndConstrains", "abc"); +// jObjectBody.put("licenseTerm", licenseTermpObject); +// jObjectBody.put("addedFeatureGroupsIds", Arrays.asList(featureGroupId).toArray()); +// +// Map<String, String> headersMap = prepareHeadersMap(userId); +// +// HttpRequest http = new HttpRequest(); +// RestResponse response = http.httpSendPost(url, jObjectBody.toString(), headersMap); +// return response; +// } +// +// public static RestResponse createVendorLicenseFeatureGroups_4(String vspid, 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); +// String userId = user.getUserId(); +// +// JSONObject jObject = new JSONObject(); +// jObject.put("name", "xyz"); +// jObject.put("description", "new vendor license feature groups"); +// jObject.put("partNumber", "123abc456"); +// jObject.put("manufacturerReferenceNumber", "5"); +// jObject.put("addedLicenseKeyGroupsIds", Arrays.asList(licenseKeyGroupId).toArray()); +// jObject.put("addedEntitlementPoolsIds", Arrays.asList(entitlementPoolId).toArray()); +// +// Map<String, String> headersMap = prepareHeadersMap(userId); +// +// HttpRequest http = new HttpRequest(); +// RestResponse response = http.httpSendPost(url, jObject.toString(), headersMap); +// return response; +// +// } +// +// public static RestResponse createVendorEntitlementPool_3(String vspid, User user) throws Exception { +// Config config = Utils.getConfig(); +// String url = String.format(Urls.CREATE_VENDOR_LISENCE_ENTITLEMENT_POOL, config.getCatalogBeHost(), config.getCatalogBePort(), vspid); +// String userId = user.getUserId(); +// +// JSONObject jEntitlementMetricObject = new JSONObject(); +// jEntitlementMetricObject.put("choice", "CPU"); +// jEntitlementMetricObject.put("other", ""); +// +// JSONObject jAggregationFunctionObject = new JSONObject(); +// jAggregationFunctionObject.put("choice", "Peak"); +// jAggregationFunctionObject.put("other", ""); +// +// JSONObject jOperationalScope = new JSONObject(); +// jOperationalScope.put("choices", Arrays.asList("Availability_Zone").toArray()); +// jOperationalScope.put("other", ""); +// +// JSONObject jTimeObject = new JSONObject(); +// jTimeObject.put("choice", "Hour"); +// jTimeObject.put("other", ""); +// +// JSONObject jObjectBody = new JSONObject(); +// jObjectBody.put("name", "def"+ getShortUUID()); +// jObjectBody.put("description", "new vendor license entitlement pool"); +// jObjectBody.put("thresholdValue", "23"); +// jObjectBody.put("thresholdUnits", "Absolute"); +// jObjectBody.put("entitlementMetric", jEntitlementMetricObject); +// jObjectBody.put("increments", "abcd"); +// jObjectBody.put("aggregationFunction", jAggregationFunctionObject); +// jObjectBody.put("operationalScope", jOperationalScope); +// jObjectBody.put("time", jTimeObject); +// jObjectBody.put("manufacturerReferenceNumber", "123aaa"); +// +// Map<String, String> headersMap = prepareHeadersMap(userId); +// +// HttpRequest http = new HttpRequest(); +// RestResponse response = http.httpSendPost(url, jObjectBody.toString(), headersMap); +// return response; +// } +// +// public static RestResponse createVendorKeyGroups_2(String vspid, User user) throws Exception { +// Config config = Utils.getConfig(); +// String url = String.format(Urls.CREATE_VENDOR_LISENCE_KEY_GROUPS, config.getCatalogBeHost(), config.getCatalogBePort(), vspid); +// String userId = user.getUserId(); +// +// JSONObject jOperationalScope = new JSONObject(); +// jOperationalScope.put("choices", Arrays.asList("Tenant").toArray()); +// jOperationalScope.put("other", ""); +// +// JSONObject jObjectBody = new JSONObject(); +// jObjectBody.put("name", "keyGroup" + getShortUUID()); +// jObjectBody.put("description", "new vendor license key group"); +// jObjectBody.put("operationalScope", jOperationalScope); +// jObjectBody.put("type", "Universal"); +// +// Map<String, String> headersMap = prepareHeadersMap(userId); +// +// HttpRequest http = new HttpRequest(); +// RestResponse response = http.httpSendPost(url, jObjectBody.toString(), headersMap); +// return response; +// } + +// public static Pair<RestResponse, Map<String, String>> createNewVendorSoftwareProduct(ResourceReqDetails resourceReqDetails, String vspName, AmdocsLicenseMembers amdocsLicenseMembers, User user) throws Exception { +// Map<String, String> vspMetadta = new HashMap<String, String>(); +// +// Config config = Utils.getConfig(); +// String url = String.format(Urls.CREATE_VENDOR_SOFTWARE_PRODUCT, config.getCatalogBeHost(), config.getCatalogBePort()); +// String userId = user.getUserId(); +// VendorSoftwareProductObject vendorSoftwareProductObject = new VendorSoftwareProductObject(); +// LicensingData licensingData = new LicensingData(amdocsLicenseMembers.getVendorLicenseAgreementId(), Arrays.asList(amdocsLicenseMembers.getFeatureGroupId())); +// LicensingVersion licensingVersion = new LicensingVersion("1.0", "1.0"); +// ResourceCategoryEnum resourceCategoryEnum = ResourceCategoryEnum.findEnumNameByValues(resourceReqDetails.getCategories().get(0).getName(), resourceReqDetails.getCategories().get(0).getSubcategories().get(0).getName()); +// +// vendorSoftwareProductObject.setLicensingVersion(licensingVersion); +// +// vendorSoftwareProductObject.setName(vspName); +// vendorSoftwareProductObject.setDescription(resourceReqDetails.getDescription()); +// vendorSoftwareProductObject.setCategory(resourceCategoryEnum.getCategoryUniqeId()); +// vendorSoftwareProductObject.setSubCategory(resourceCategoryEnum.getSubCategoryUniqeId()); +// vendorSoftwareProductObject.setOnboardingMethod("NetworkPackage"); +// vendorSoftwareProductObject.setVendorName(amdocsLicenseMembers.getVendorLicenseName()); +// vendorSoftwareProductObject.setVendorId(amdocsLicenseMembers.getVendorId()); +// vendorSoftwareProductObject.setIcon("icon"); +// vendorSoftwareProductObject.setLicensingData(licensingData); +// +// vspMetadta.put("description", resourceReqDetails.getDescription()); +// vspMetadta.put("category", resourceCategoryEnum.getCategory()); +// vspMetadta.put("subCategory", resourceCategoryEnum.getSubCategory()); +// +// Map<String, String> headersMap = prepareHeadersMap(userId); +// HttpRequest http = new HttpRequest(); +// Gson gson = new Gson(); +// String body = gson.toJson(vendorSoftwareProductObject); +// +// RestResponse response = http.httpSendPost(url, body, headersMap); +// return new Pair<RestResponse, Map<String, String>>(response, vspMetadta); +// } + + +// public static RestResponse validateUpload(String vspid, User user, String vspVersion) throws Exception { +// Config config = Utils.getConfig(); +// String url = String.format(Urls.VALIDATE_UPLOAD, config.getCatalogBeHost(), config.getCatalogBePort(), vspid,vspVersion); +// +// String userId = user.getUserId(); +// +// Map<String, String> headersMap = prepareHeadersMap(userId); +// HttpRequest http = new HttpRequest(); +// +// String body =null; +// +// RestResponse response = http.httpSendPut(url, body, headersMap); +// +// return response; +// } + +// public static RestResponse uploadHeatPackage(String filepath, String filename, String vspid, User user, String vspVersion) throws Exception { +// Config config = Utils.getConfig(); +// String url = String.format(Urls.UPLOAD_HEAT_PACKAGE, config.getCatalogBeHost(), config.getCatalogBePort(), vspid, vspVersion); +// return uploadFile(filepath, filename, url, user); +// } + +// private static RestResponse uploadFile(String filepath, String filename, String url, User user) +// throws FileNotFoundException, IOException, ClientProtocolException { +// CloseableHttpResponse response = null; +// +// MultipartEntityBuilder mpBuilder = MultipartEntityBuilder.create(); +// mpBuilder.addPart("upload", new FileBody(getTestZipFile(filepath, filename))); +// +// Map<String, String> headersMap = prepareHeadersMap(user.getUserId()); +// headersMap.put(HttpHeaderEnum.CONTENT_TYPE.getValue(), "multipart/form-data"); +// +// CloseableHttpClient client = HttpClients.createDefault(); +// try { +// HttpPost httpPost = new HttpPost(url); +// RestResponse restResponse = new RestResponse(); +// +// Iterator<String> iterator = headersMap.keySet().iterator(); +// while (iterator.hasNext()) { +// String key = iterator.next(); +// String value = headersMap.get(key); +// httpPost.addHeader(key, value); +// } +// httpPost.setEntity(mpBuilder.build()); +// response = client.execute(httpPost); +// HttpEntity entity = response.getEntity(); +// String responseBody = null; +// if (entity != null) { +// InputStream instream = entity.getContent(); +// try { +// StringWriter writer = new StringWriter(); +// IOUtils.copy(instream, writer); +// responseBody = writer.toString(); +// } finally { +// instream.close(); +// } +// } +// +// restResponse.setErrorCode(response.getStatusLine().getStatusCode()); +// restResponse.setResponse(responseBody); +// +// return restResponse; +// +// } finally { +// closeResponse(response); +// closeHttpClient(client); +// +// } +// } + +// private static void closeResponse(CloseableHttpResponse response) { +// try { +// if (response != null) { +// response.close(); +// } +// } catch (IOException e) { +// System.out.println(String.format("failed to close client or response: %s", e.getMessage())); +// } +// } +// +// private static void closeHttpClient(CloseableHttpClient client) { +// try { +// if (client != null) { +// client.close(); +// } +// } catch (IOException e) { +// System.out.println(String.format("failed to close client or response: %s", e.getMessage())); +// } +// } + +// private static File getTestZipFile(String filepath, String filename) throws IOException { +// Config config = Utils.getConfig(); +// String sourceDir = config.getImportResourceTestsConfigDir(); +// java.nio.file.Path filePath; +// if(filename == null){ +// filePath = FileSystems.getDefault().getPath(filepath); +// }else{ +// filePath = FileSystems.getDefault().getPath(filepath + File.separator + filename); +// } +// return filePath.toFile(); +// } + +// public static RestResponse checkinVendorSoftwareProduct(String vspid, User user, String vspVersion) throws Exception { +// return actionOnComponent(vspid, "Checkin", "vendor-software-products", user, vspVersion); +// } +// +// private static RestResponse checkoutVendorSoftwareProduct(String vspid, User user, String vspVersion) throws Exception { +// return actionOnComponent(vspid, "Checkout", "vendor-software-products", user, vspVersion); +// } +// +// public static RestResponse submitVendorSoftwareProduct(String vspid, User user, String vspVersion) throws Exception { +// return actionOnComponent(vspid, "Submit", "vendor-software-products", user, vspVersion); +// } +// +// public static RestResponse createPackageOfVendorSoftwareProduct(String vspid, User user, String vspVersion) throws Exception { +// return actionOnComponent(vspid, "Create_Package", "vendor-software-products", user, vspVersion); +// } + +// 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; +// } + + + private static void importUpdateVSP(Pair<String, Map<String, String>> vsp, boolean isUpdate) throws Exception{ + String vspName = vsp.left; + Map<String, String> vspMetadata = vsp.right; + boolean vspFound = HomePage.searchForVSP(vspName); + + if (vspFound){ + + List<WebElement> elemenetsFromTable = HomePage.getElemenetsFromTable(); +// WebDriverWait wait = new WebDriverWait(GeneralUIUtils.getDriver(), 30); +// WebElement findElement = wait.until(ExpectedConditions.visibilityOf(elemenetsFromTable.get(1))); +// findElement.click(); + elemenetsFromTable.get(1).click(); + GeneralUIUtils.waitForLoader(); + + if (isUpdate){ + GeneralUIUtils.clickOnElementByTestId(DataTestIdEnum.ImportVfRepository.UPDATE_VSP.getValue()); + + } + else{ + GeneralUIUtils.clickOnElementByTestId(DataTestIdEnum.ImportVfRepository.IMPORT_VSP.getValue()); + } + + String lifeCycleState = ResourceGeneralPage.getLifeCycleState(); + boolean needCheckout = lifeCycleState.equals(LifeCycleStateEnum.CHECKIN.getValue()) || lifeCycleState.equals(LifeCycleStateEnum.CERTIFIED.getValue()); + if (needCheckout) + { + try { + ResourceGeneralPage.clickCheckoutButton(); + Assert.assertTrue(ResourceGeneralPage.getLifeCycleState().equals(LifeCycleStateEnum.CHECKOUT.getValue()), "Did not succeed to checkout"); + + } catch (Exception e) { + ExtentTestActions.log(Status.ERROR, "Did not succeed to checkout"); + e.printStackTrace(); + } + GeneralUIUtils.waitForLoader(); + } + + //Metadata verification + VfVerificator.verifyOnboardedVnfMetadata(vspName, vspMetadata); + + ExtentTestActions.log(Status.INFO, "Clicking create/update VNF"); + String duration = GeneralUIUtils.getActionDuration(() -> waitUntilVnfCreated()); + ExtentTestActions.log(Status.INFO, "Succeeded in importing/updating " + vspName, duration); + } + else{ + Assert.fail("Did not find VSP named " + vspName); + } + } + + private static void waitUntilVnfCreated() { + GeneralUIUtils.clickOnElementByTestIdWithoutWait(DataTestIdEnum.GeneralElementsEnum.CREATE_BUTTON.getValue()); + GeneralUIUtils.waitForLoader(60*10); + GeneralUIUtils.waitForAngular(); + GeneralUIUtils.getWebElementByTestID(DataTestIdEnum.GeneralElementsEnum.CHECKIN_BUTTON.getValue()); + } + + public static void updateVSP(Pair<String, Map<String, String>> vsp) throws Exception{ + ExtentTestActions.log(Status.INFO, "Updating VSP " + vsp.left); + importUpdateVSP(vsp, true); + } + + public static void importVSP(Pair<String, Map<String, String>> vsp) throws Exception{ + ExtentTestActions.log(Status.INFO, "Importing VSP " + vsp.left); + importUpdateVSP(vsp, false); + } + + public static void updateVnfAndValidate(String filepath, Pair<String, Map<String, String>> vsp, String updatedVnfFile, User user) throws Exception, Throwable { + ExtentTestActions.log(Status.INFO, String.format("Going to update the VNF with %s......", updatedVnfFile)); + System.out.println(String.format("Going to update the VNF with %s......", updatedVnfFile)); + + Map<String, String> vspMap = vsp.right; + String vspId = vspMap.get("vspId"); + + updateVendorSoftwareProduct(vspId, updatedVnfFile, filepath, user, "0.1"); + HomePage.showVspRepository(); + updateVSP(vsp); + ResourceGeneralPage.getLeftMenu().moveToDeploymentArtifactScreen(); + DeploymentArtifactPage.verifyArtifactsExistInTable(filepath, updatedVnfFile); + } + + public static Pair<String, Map<String, String>> onboardAndValidate(ResourceReqDetails resourceReqDetails, String filepath, String vnfFile, User user) throws Exception { + ExtentTestActions.log(Status.INFO, String.format("Going to onboard the VNF %s", vnfFile)); + System.out.println(String.format("Going to onboard the VNF %s", vnfFile)); + + AmdocsLicenseMembers amdocsLicenseMembers = createVendorLicense(user); + Pair<String, Map<String, String>> createVendorSoftwareProduct = OnboardingUtils.createVendorSoftwareProduct(resourceReqDetails, vnfFile, filepath, user, amdocsLicenseMembers); + String vspName = createVendorSoftwareProduct.left; + + DownloadManager.downloadCsarByNameFromVSPRepository(vspName, createVendorSoftwareProduct.right.get("vspId")); + File latestFilefromDir = FileHandling.getLastModifiedFileNameFromDir(); + + ExtentTestActions.log(Status.INFO, String.format("Searching for onboarded %s", vnfFile)); + HomePage.showVspRepository(); + ExtentTestActions.log(Status.INFO,String.format("Going to import %s", vnfFile.substring(0, vnfFile.indexOf(".")))); + importVSP(createVendorSoftwareProduct); + + ResourceGeneralPage.getLeftMenu().moveToDeploymentArtifactScreen(); + + // Verify deployment artifacts + Map<String, Object> combinedMap = ArtifactFromCsar.combineHeatArtifacstWithFolderArtifacsToMap(latestFilefromDir.getAbsolutePath()); + + LinkedList<HeatMetaFirstLevelDefinition> deploymentArtifacts = ((LinkedList<HeatMetaFirstLevelDefinition>) combinedMap.get("Deployment")); + ArtifactsCorrelationManager.addVNFartifactDetails(vspName, deploymentArtifacts); + + List<String> heatEnvFilesFromCSAR = deploymentArtifacts.stream().filter(e -> e.getType().equals("HEAT_ENV")). + map(e -> e.getFileName()). + collect(Collectors.toList()); + + validateDeploymentArtifactsVersion(deploymentArtifacts, heatEnvFilesFromCSAR); + + DeploymentArtifactPage.verifyArtifactsExistInTable(filepath, vnfFile); + return createVendorSoftwareProduct; + } + + public static void validateDeploymentArtifactsVersion(LinkedList<HeatMetaFirstLevelDefinition> deploymentArtifacts, + List<String> heatEnvFilesFromCSAR) { + String artifactVersion; + String artifactName; + + for(HeatMetaFirstLevelDefinition deploymentArtifact: deploymentArtifacts) { + artifactVersion = "1"; + + if(deploymentArtifact.getType().equals("HEAT_ENV")) { + continue; + } else if(deploymentArtifact.getFileName().contains(".")) { + artifactName = deploymentArtifact.getFileName().trim().substring(0, deploymentArtifact.getFileName().lastIndexOf(".")); + } else { + artifactName = deploymentArtifact.getFileName().trim(); + } + + if (heatEnvFilesFromCSAR.contains(artifactName + ".env")){ + artifactVersion = "2"; + } + ArtifactUIUtils.validateArtifactNameVersionType(artifactName, artifactVersion, deploymentArtifact.getType()); + } + } + +// public static VendorSoftwareProductObject updateVSPWithNewVLMParameters(VendorSoftwareProductObject vendorSoftwareProductObject, +// AmdocsLicenseMembers amdocsLicenseMembers, User user, String vspCurrentVersion, String vspNextVersion) throws Exception { +// +// LicensingVersion licensingVersion = new LicensingVersion(amdocsLicenseMembers.getLicenseVersionId(),amdocsLicenseMembers.getLicenseVersionId()); +// LicensingData licensingData = new LicensingData(amdocsLicenseMembers.getVendorLicenseAgreementId(), Arrays.asList(amdocsLicenseMembers.getFeatureGroupId())); +// vendorSoftwareProductObject.setVendorId(amdocsLicenseMembers.getVendorId()); +// vendorSoftwareProductObject.setVendorName(amdocsLicenseMembers.getVendorLicenseName()); +// vendorSoftwareProductObject.setLicensingVersion(licensingVersion); +// vendorSoftwareProductObject.setLicensingData(licensingData); +// +// VendorSoftwareProductObjectReqDetails vendorSoftwareProductObjectReqDetails = new VendorSoftwareProductObjectReqDetails( +// vendorSoftwareProductObject.getName(), +// vendorSoftwareProductObject.getDescription(), +// vendorSoftwareProductObject.getCategory(), +// vendorSoftwareProductObject.getSubCategory(), +// vendorSoftwareProductObject.getVendorId(), +// vendorSoftwareProductObject.getVendorName(), +// licensingVersion, +// licensingData, +// vendorSoftwareProductObject.getOnboardingMethod(), +// vendorSoftwareProductObject.getNetworkPackageName(), +// vendorSoftwareProductObject.getOnboardingOrigin()); +// +// Gson gson = new Gson(); +// String json = gson.toJson(vendorSoftwareProductObjectReqDetails); +// +// RestResponse checkout = checkoutVendorSoftwareProduct(vendorSoftwareProductObject.getVspId(), user, "1.0"); +// assertEquals("did not succeed to checkout new VSP", 200, checkout.getErrorCode().intValue()); +// +// Config config = Utils.getConfig(); +// String url = String.format(Urls.UPDATE_VSP, config.getCatalogBeHost(), config.getCatalogBePort(), vendorSoftwareProductObject.getVspId(), vspCurrentVersion); +// String userId = user.getUserId(); +// +// Map<String, String> headersMap = prepareHeadersMap(userId); +// HttpRequest http = new HttpRequest(); +// +// RestResponse response = http.httpSendPut(url, json, headersMap); +// +// RestResponse checkin = checkinVendorSoftwareProduct(vendorSoftwareProductObject.getVspId(), user, vspCurrentVersion); +// assertEquals("did not succeed to checking VSP", 200, checkin.getErrorCode().intValue()); +// +// RestResponse submit = submitVendorSoftwareProduct(vendorSoftwareProductObject.getVspId(), user, vspCurrentVersion); +// assertEquals("did not succeed to submit VSP", 200, submit.getErrorCode().intValue()); +// +// vendorSoftwareProductObject.setVersion(vspNextVersion); +// +// return vendorSoftwareProductObject; +// } + +// /** +// * @return +// * The method returns VNF names list from Files directory under sdc-vnfs repository +// */ +// public static List<String> getVnfNamesFileList() { +// String filepath = FileHandling.getVnfRepositoryPath(); +// List<String> fileNamesFromFolder = FileHandling.getZipFileNamesFromFolder(filepath); +// fileNamesFromFolder.removeAll(exludeVnfList); +// return fileNamesFromFolder; +// } +// +// /** +// * @return +// * The method returns VNF names list from Files directory under sdc-vnfs repository excluding zip files that known as failed in tosca parser +// */ +// public static List<String> getVnfNamesFileListExcludeToscaParserFailure() { +// List<String> fileNamesFromFolder = getVnfNamesFileList(); +// fileNamesFromFolder.removeAll(exludeVnfListForToscaParser); +// return fileNamesFromFolder; +// } + +} + + |