From 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 Mon Sep 17 00:00:00 2001 From: Ittay Stern Date: Mon, 31 Dec 2018 17:21:27 +0200 Subject: Merge from ECOMP's repository Main Features -------------- - Async-Instantiation jobs mechanism major update; still WIP (package `org.onap.vid.job`) - New features in View/Edit: Activate fabric configuration; show related networks; soft delete - Support AAI service-tree traversal (`AAIServiceTree`) - In-memory cache for SDC models and certain A&AI queries (`CacheProviderWithLoadingCache`) - Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA models - Resolve Cloud-Owner values for MSO - Pass X-ONAP headers to MSO Infrastructure -------------- - Remove codehaus' jackson mapper; use soley fasterxml 2.9.7 - Surefire invokes both TestNG and JUnit tests - Support Kotlin source files - AaiController2 which handles errors in a "Spring manner" - Inline generated-sources and remove jsonschema2pojo Quality -------- - Cumulative bug fixes (A&AI API, UI timeouts, and many more) - Many Sonar issues cleaned-up - Some unused classes removed - Minor changes in vid-automation project, allowing some API verification to run Hard Merges ------------ - HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest) - Moved `package org.onap.vid.controllers` to `controller`, without plural -- just to keep semantic sync with ECOMP. Reference commit in ECOMP: 3d1141625 Issue-ID: VID-378 Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788 Signed-off-by: Ittay Stern --- .../java/org/onap/vid/job/impl/JobAdapterTest.java | 100 +++++++++++++++++++++ 1 file changed, 100 insertions(+) create mode 100644 vid-app-common/src/test/java/org/onap/vid/job/impl/JobAdapterTest.java (limited to 'vid-app-common/src/test/java/org/onap/vid/job/impl/JobAdapterTest.java') diff --git a/vid-app-common/src/test/java/org/onap/vid/job/impl/JobAdapterTest.java b/vid-app-common/src/test/java/org/onap/vid/job/impl/JobAdapterTest.java new file mode 100644 index 000000000..95228476b --- /dev/null +++ b/vid-app-common/src/test/java/org/onap/vid/job/impl/JobAdapterTest.java @@ -0,0 +1,100 @@ +package org.onap.vid.job.impl; + +import com.google.common.collect.ImmutableMap; +import org.apache.commons.lang3.RandomUtils; +import org.onap.vid.job.Job; +import org.onap.vid.job.JobAdapter; +import org.onap.vid.job.JobType; +import org.onap.vid.job.command.JobCommandFactoryTest; +import org.testng.annotations.Test; + +import java.util.UUID; + +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotEquals; +import static org.testng.AssertJUnit.assertNotNull; + +public class JobAdapterTest { + + @Test + public void testCreateServiceInstantiationJob() { + JobAdapter jobAdapter = new JobAdapterImpl(); + + JobType jobType = JobType.NoOp; + JobAdapter.AsyncJobRequest request = new JobCommandFactoryTest.MockedRequest(42,"nothing"); + UUID templateId = UUID.randomUUID(); + String userId = "ou012t"; + String optimisticUniqueServiceInstanceName = "optimisticUniqueServiceInstanceName"; + int indexInBulk = RandomUtils.nextInt(); + Job job = jobAdapter.createServiceInstantiationJob( + jobType, + request, + templateId, + userId, + optimisticUniqueServiceInstanceName, + indexInBulk + ); + + assertEquals(job.getType(), jobType); + assertEquals(job.getSharedData().getRequest(), request); + assertEquals(job.getSharedData().getRequestType(), request.getClass()); + assertEquals(job.getSharedData().getUserId(), userId); + assertEquals(job.getSharedData().getJobUuid(), job.getUuid()); + assertEquals(job.getSharedData().getRootJobId(), job.getUuid()); + assertNotNull(job.getUuid()); + assertEquals(job.getTemplateId(), templateId); + assertEquals(job.getData().get("optimisticUniqueServiceInstanceName"), optimisticUniqueServiceInstanceName); + assertEquals((int)job.getIndexInBulk(), indexInBulk ); + assertEquals(job.getStatus(), Job.JobStatus.PENDING); + } + + @Test + public void testCreateChildJob() { + + JobAdapter jobAdapter = new JobAdapterImpl(); + + UUID templateId = UUID.randomUUID(); + String userId = "ou012t"; + String optimisticUniqueServiceInstanceName = "optimisticUniqueServiceInstanceName"; + int indexInBulk = RandomUtils.nextInt(); + Job grandJob = jobAdapter.createServiceInstantiationJob( + JobType.HttpCall, + new JobCommandFactoryTest.MockedRequest(99, "anything"), + templateId, + userId, + optimisticUniqueServiceInstanceName, + indexInBulk + ); + + Job.JobStatus jobStatus = Job.JobStatus.PAUSE; + JobType jobType = JobType.NoOp; + JobAdapter.AsyncJobRequest request = new JobCommandFactoryTest.MockedRequest(42,"nothing"); + Job parentJob = jobAdapter.createChildJob(jobType, jobStatus, request, grandJob.getSharedData(), ImmutableMap.of()); + + assertEquals(parentJob.getType(), jobType); + assertEquals(parentJob.getSharedData().getRequest(), request); + assertEquals(parentJob.getSharedData().getRequestType(), request.getClass()); + assertEquals(parentJob.getSharedData().getUserId(), userId); + assertEquals(parentJob.getSharedData().getJobUuid(), parentJob.getUuid()); + assertNotNull(parentJob.getUuid()); + assertNotEquals(parentJob.getUuid(), grandJob.getUuid()); + assertEquals(parentJob.getStatus(), jobStatus); + assertEquals(parentJob.getSharedData().getRootJobId(), grandJob.getUuid()); + + Job.JobStatus jobStatus2 = Job.JobStatus.IN_PROGRESS; + JobType jobType2 = JobType.AggregateState; + JobAdapter.AsyncJobRequest request2 = new JobCommandFactoryTest.MockedRequest(66,"abc"); + Job job = jobAdapter.createChildJob(jobType2, jobStatus2, request2, parentJob.getSharedData(), ImmutableMap.of()); + + assertEquals(job.getType(), jobType2); + assertEquals(job.getSharedData().getRequest(), request2); + assertEquals(job.getSharedData().getRequestType(), request2.getClass()); + assertEquals(job.getSharedData().getUserId(), userId); + assertEquals(job.getSharedData().getJobUuid(), job.getUuid()); + assertNotNull(job.getUuid()); + assertNotEquals(job.getUuid(), parentJob.getUuid()); + assertEquals(job.getStatus(), jobStatus2); + assertEquals(job.getSharedData().getRootJobId(), grandJob.getUuid()); + + } +} -- cgit 1.2.3-korg