import org.springframework.context.annotation.Scope
import org.springframework.http.HttpMethod
import org.springframework.stereotype.Component
+import org.togglz.core.manager.FeatureManager
import java.time.ZonedDateTime
import java.time.temporal.ChronoUnit
import java.util.*
msoResultHandlerService: MsoResultHandlerService,
jobAdapter: JobAdapter,
restMso: RestMsoImplementation,
- auditService: AuditService
+ auditService: AuditService,
+ featureManager: FeatureManager
) : RootServiceCommand(restMso, inProgressStatusService, msoResultHandlerService,
- watchChildrenJobsBL, jobsBrokerService, jobAdapter, asyncInstantiationBL, auditService, msoRequestBuilder), JobCommand {
+ watchChildrenJobsBL, jobsBrokerService, jobAdapter, asyncInstantiationBL, auditService, msoRequestBuilder, featureManager), JobCommand {
companion object {
private val LOGGER = EELFLoggerDelegate.getLogger(ALaCarteServiceCommand::class.java)
import org.springframework.context.annotation.Scope
import org.springframework.http.HttpMethod
import org.springframework.stereotype.Component
+import org.togglz.core.manager.FeatureManager
import java.util.*
@Component
inProgressStatusService:InProgressStatusService,
watchChildrenJobsBL: WatchChildrenJobsBL,
jobsBrokerService: JobsBrokerService,
- jobAdapter: JobAdapter
- ) : ResourceCommand(restMso, inProgressStatusService, msoResultHandlerService,
- watchChildrenJobsBL, jobsBrokerService, jobAdapter), JobCommand {
+ jobAdapter: JobAdapter,
+ featureManager: FeatureManager
+) : ResourceCommand(restMso, inProgressStatusService, msoResultHandlerService,
+ watchChildrenJobsBL, jobsBrokerService, jobAdapter, featureManager), JobCommand {
companion object {
private val LOGGER = EELFLoggerDelegate.getLogger(InstanceGroupCommand::class.java)
import org.springframework.context.annotation.Scope
import org.springframework.http.HttpMethod
import org.springframework.stereotype.Component
+import org.togglz.core.manager.FeatureManager
import java.util.*
@Component
inProgressStatusService:InProgressStatusService,
watchChildrenJobsBL: WatchChildrenJobsBL,
jobsBrokerService: JobsBrokerService,
- jobAdapter: JobAdapter
+ jobAdapter: JobAdapter,
+ featureManager: FeatureManager
) : ResourceCommand(restMso, inProgressStatusService, msoResultHandlerService,
- watchChildrenJobsBL, jobsBrokerService, jobAdapter), JobCommand {
+ watchChildrenJobsBL, jobsBrokerService, jobAdapter, featureManager), JobCommand {
companion object {
private val LOGGER = EELFLoggerDelegate.getLogger(InstanceGroupMemberCommand::class.java)
import org.springframework.context.annotation.Scope
import org.springframework.http.HttpMethod
import org.springframework.stereotype.Component
+import org.togglz.core.manager.FeatureManager
import java.util.*
@Component
msoResultHandlerService: MsoResultHandlerService,
jobAdapter: JobAdapter,
restMso: RestMsoImplementation,
- auditService: AuditService
+ auditService: AuditService,
+ featureManager: FeatureManager
) : RootServiceCommand(restMso, inProgressStatusService, msoResultHandlerService,
- watchChildrenJobsBL, jobsBrokerService, jobAdapter, asyncInstantiationBL, auditService, msoRequestBuilder), JobCommand {
+ watchChildrenJobsBL, jobsBrokerService, jobAdapter, asyncInstantiationBL, auditService, msoRequestBuilder, featureManager), JobCommand {
companion object {
import org.springframework.context.annotation.Scope
import org.springframework.http.HttpMethod
import org.springframework.stereotype.Component
+import org.togglz.core.manager.FeatureManager
import java.util.*
inProgressStatusService:InProgressStatusService,
watchChildrenJobsBL: WatchChildrenJobsBL,
jobsBrokerService: JobsBrokerService,
- jobAdapter: JobAdapter
- ) : ResourceCommand(restMso, inProgressStatusService, msoResultHandlerService,
- watchChildrenJobsBL, jobsBrokerService, jobAdapter), JobCommand {
+ jobAdapter: JobAdapter,
+ featureManager: FeatureManager
+) : ResourceCommand(restMso, inProgressStatusService, msoResultHandlerService,
+ watchChildrenJobsBL, jobsBrokerService, jobAdapter, featureManager), JobCommand {
override fun createChildren(): Job.JobStatus {
return Job.JobStatus.COMPLETED_WITH_NO_ACTION
}
import org.onap.vid.model.Action
import org.onap.vid.model.RequestReferencesContainer
import org.onap.vid.model.serviceInstantiation.BaseResource
+import org.onap.vid.model.serviceInstantiation.BaseResource.PauseInstantiation.afterCompletion
import org.onap.vid.mso.RestMsoImplementation
import org.onap.vid.mso.model.ModelInfo
+import org.onap.vid.properties.Features
import org.onap.vid.utils.JACKSON_OBJECT_MAPPER
import org.onap.vid.utils.getEnumFromMapOfStrings
import org.springframework.http.HttpMethod
+import org.togglz.core.manager.FeatureManager
import java.util.*
protected val msoResultHandlerService: MsoResultHandlerService,
protected val watchChildrenJobsBL: WatchChildrenJobsBL,
private val jobsBrokerService: JobsBrokerService,
- private val jobAdapter: JobAdapter
+ private val jobAdapter: JobAdapter,
+ private val featureManager: FeatureManager
) : CommandBase(), JobCommand {
companion object {
import org.onap.vid.services.AuditService
import org.springframework.beans.factory.annotation.Autowired
import org.springframework.http.HttpMethod
+import org.togglz.core.manager.FeatureManager
import java.util.*
abstract class RootServiceCommand @Autowired constructor(
jobAdapter: JobAdapter,
private val asyncInstantiationBL: AsyncInstantiationBusinessLogic,
private val auditService: AuditService,
- private val msoRequestBuilder: MsoRequestBuilder
+ private val msoRequestBuilder: MsoRequestBuilder,
+ featureManager: FeatureManager
) : ResourceCommand(restMso, inProgressStatusService, msoResultHandlerService,
- watchChildrenJobsBL, jobsBrokerService, jobAdapter), JobCommand {
+ watchChildrenJobsBL, jobsBrokerService, jobAdapter, featureManager), JobCommand {
lateinit var optimisticUniqueServiceInstanceName: String
import org.springframework.context.annotation.Scope
import org.springframework.http.HttpMethod
import org.springframework.stereotype.Component
+import org.togglz.core.manager.FeatureManager
import java.util.*
typealias ToscaVfm = org.onap.vid.model.VfModule
inProgressStatusService:InProgressStatusService,
watchChildrenJobsBL: WatchChildrenJobsBL,
jobsBrokerService: JobsBrokerService,
- jobAdapter: JobAdapter
+ jobAdapter: JobAdapter,
+ featureManager: FeatureManager
) : ResourceCommand(restMso, inProgressStatusService, msoResultHandlerService,
- watchChildrenJobsBL, jobsBrokerService, jobAdapter), JobCommand {
+ watchChildrenJobsBL, jobsBrokerService, jobAdapter, featureManager), JobCommand {
companion object {
private val LOGGER = EELFLoggerDelegate.getLogger(VfmoduleCommand::class.java)
jobAdapter: JobAdapter,
private val featureManager: FeatureManager
) : ResourceCommand(restMso, inProgressStatusService, msoResultHandlerService,
- watchChildrenJobsBL, jobsBrokerService, jobAdapter), JobCommand {
+ watchChildrenJobsBL, jobsBrokerService, jobAdapter, featureManager), JobCommand {
private var needToCreateBaseModule:Boolean by Delegates.notNull<Boolean>()
import org.springframework.context.annotation.Scope
import org.springframework.http.HttpMethod
import org.springframework.stereotype.Component
+import org.togglz.core.manager.FeatureManager
import java.util.*
@Component
inProgressStatusService:InProgressStatusService,
watchChildrenJobsBL: WatchChildrenJobsBL,
jobsBrokerService: JobsBrokerService,
- jobAdapter: JobAdapter
+ jobAdapter: JobAdapter,
+ featureManager: FeatureManager
) : ResourceCommand(restMso, inProgressStatusService, msoResultHandlerService,
- watchChildrenJobsBL, jobsBrokerService, jobAdapter), JobCommand {
+ watchChildrenJobsBL, jobsBrokerService, jobAdapter, featureManager), JobCommand {
companion object {
private val LOGGER = EELFLoggerDelegate.getLogger(VolumeGroupCommand::class.java)
InProgressStatusService inProgressStatusService,
WatchChildrenJobsBL watchChildrenJobsBL,
RestMsoImplementation restMso,
- AuditService auditService) {
- return new ALaCarteServiceCommand(inProgressStatusService, watchChildrenJobsBL, asyncInstantiationBusinessLogic, jobsBrokerService, msoRequestBuilder, msoResultHandlerService, jobAdapter, restMso, auditService);
+ AuditService auditService,
+ FeatureManager featureManager) {
+ return new ALaCarteServiceCommand(inProgressStatusService, watchChildrenJobsBL, asyncInstantiationBusinessLogic, jobsBrokerService, msoRequestBuilder, msoResultHandlerService, jobAdapter, restMso, auditService, featureManager);
}
@Bean
InProgressStatusService inProgressStatusService,
WatchChildrenJobsBL watchChildrenJobsBL,
RestMsoImplementation restMso,
- AuditService auditService) {
- return new MacroServiceCommand(inProgressStatusService, watchChildrenJobsBL, asyncInstantiationBusinessLogic, jobsBrokerService, msoRequestBuilder, msoResultHandlerService, jobAdapter, restMso, auditService);
+ AuditService auditService,
+ FeatureManager featureManager) {
+ return new MacroServiceCommand(inProgressStatusService, watchChildrenJobsBL, asyncInstantiationBusinessLogic, jobsBrokerService, msoRequestBuilder, msoResultHandlerService, jobAdapter, restMso, auditService, featureManager);
}
InProgressStatusService inProgressStatusService,
WatchChildrenJobsBL watchChildrenJobsBL,
JobsBrokerService jobsBrokerService,
- JobAdapter jobAdapter) {
+ JobAdapter jobAdapter,
+ FeatureManager featureManager) {
return new NetworkCommand(asyncInstantiationBusinessLogic, restMso, msoRequestBuilder, msoResultHandlerService,
- inProgressStatusService, watchChildrenJobsBL, jobsBrokerService, jobAdapter);
+ inProgressStatusService, watchChildrenJobsBL, jobsBrokerService, jobAdapter, featureManager);
}
@Bean
@Scope(ConfigurableBeanFactory.SCOPE_PROTOTYPE)
WatchChildrenJobsBL watchChildrenJobsBL,
RestMsoImplementation restMso,
JobsBrokerService jobsBrokerService,
- JobAdapter jobAdapter) {
- return new InstanceGroupCommand(asyncInstantiationBusinessLogic, restMso, msoRequestBuilder, msoResultHandlerService, inProgressStatusService, watchChildrenJobsBL, jobsBrokerService, jobAdapter);
+ JobAdapter jobAdapter,
+ FeatureManager featureManager) {
+ return new InstanceGroupCommand(asyncInstantiationBusinessLogic, restMso, msoRequestBuilder, msoResultHandlerService, inProgressStatusService,
+ watchChildrenJobsBL, jobsBrokerService, jobAdapter, featureManager);
}
@Bean
WatchChildrenJobsBL watchChildrenJobsBL,
RestMsoImplementation restMso,
JobsBrokerService jobsBrokerService,
- JobAdapter jobAdapter) {
+ JobAdapter jobAdapter,
+ FeatureManager featureManager) {
return new InstanceGroupMemberCommand(asyncInstantiationBusinessLogic, restMso, msoRequestBuilder, msoResultHandlerService, inProgressStatusService,
- watchChildrenJobsBL, jobsBrokerService, jobAdapter);
+ watchChildrenJobsBL, jobsBrokerService, jobAdapter, featureManager);
}
InProgressStatusService inProgressStatusService,
WatchChildrenJobsBL watchChildrenJobsBL,
JobsBrokerService jobsBrokerService,
- JobAdapter jobAdapter) {
+ JobAdapter jobAdapter,
+ FeatureManager featureManager) {
return new VolumeGroupCommand(asyncInstantiationBusinessLogic, restMso, msoRequestBuilder, msoResultHandlerService,
- inProgressStatusService, watchChildrenJobsBL, jobsBrokerService ,jobAdapter);
+ inProgressStatusService, watchChildrenJobsBL, jobsBrokerService ,jobAdapter, featureManager);
}
@Bean
InProgressStatusService inProgressStatusService,
WatchChildrenJobsBL watchChildrenJobsBL,
JobsBrokerService jobsBrokerService,
- JobAdapter jobAdapter) {
+ JobAdapter jobAdapter,
+ FeatureManager featureManager) {
return new VfmoduleCommand(asyncInstantiationBusinessLogic, restMso, msoRequestBuilder, msoResultHandlerService,
- inProgressStatusService, watchChildrenJobsBL, jobsBrokerService, jobAdapter);
+ inProgressStatusService, watchChildrenJobsBL, jobsBrokerService, jobAdapter, featureManager);
}
@Bean
public AuditService auditService(RestMsoImplementation msoClient, AsyncInstantiationRepository asyncInstantiationRepository) {
package org.onap.vid.job.command;
+import static java.util.function.Function.identity;
+import static java.util.stream.Collectors.toMap;
+import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.eq;
+import static org.mockito.Mockito.only;
+import static org.mockito.Mockito.same;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import com.google.common.collect.ImmutableMap;
+import java.util.Optional;
+import java.util.Set;
import org.apache.commons.beanutils.BeanUtils;
import org.mockito.Answers;
import org.mockito.InjectMocks;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
-
-import java.util.Optional;
-import java.util.Set;
-
-import static java.util.function.Function.identity;
-import static java.util.stream.Collectors.toMap;
-import static org.apache.commons.lang.RandomStringUtils.randomAlphanumeric;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.*;
+import org.togglz.core.manager.FeatureManager;
public class InstanceGroupCommandTest {
@Mock InProgressStatusService inProgressStatusService;
+ @Mock FeatureManager featureManager;
+
@InjectMocks
private InstanceGroupCommand command;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import org.togglz.core.manager.FeatureManager;
public class MacroServiceCommandTest {
@Mock
private AuditService auditService;
+ @Mock
+ FeatureManager featureManager;
+
@InjectMocks
private MacroServiceCommand macroServiceCommand;
import org.springframework.http.HttpMethod;
import org.testng.annotations.DataProvider;
import org.testng.annotations.Test;
+import org.togglz.core.manager.FeatureManager;
public class ResourceCommandTest {
mock(MsoResultHandlerService.class, RETURNS_MOCKS),
mock(WatchChildrenJobsBL.class),
mock(JobsBrokerService.class, RETURNS_MOCKS),
- mock(JobAdapter.class, RETURNS_MOCKS));
+ mock(JobAdapter.class, RETURNS_MOCKS),
+ mock(FeatureManager.class));
this.mockedJobStatus = mockedJobStatus;
this.mockState = mockState;
this.mockPhase = mockPhase;
package org.onap.vid.job.command;
+import static java.util.Collections.emptyList;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.containsInAnyOrder;
+import static org.hamcrest.core.Is.is;
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+import static org.onap.vid.job.Job.JobStatus.COMPLETED;
+import static org.onap.vid.job.Job.JobStatus.COMPLETED_WITH_NO_ACTION;
+import static org.onap.vid.job.Job.JobStatus.IN_PROGRESS;
+import static org.onap.vid.job.command.ResourceCommandKt.ACTION_PHASE;
+import static org.onap.vid.job.command.ResourceCommandKt.CHILD_JOBS;
+import static org.onap.vid.job.command.ResourceCommandKt.INTERNAL_STATE;
+import static org.onap.vid.job.command.ResourceCommandTest.FakeResourceCreator.createNetwork;
+import static org.onap.vid.job.command.ResourceCommandTest.FakeResourceCreator.createService;
+import static org.onap.vid.job.command.ResourceCommandTest.FakeResourceCreator.createVnf;
+import static org.onap.vid.model.Action.Create;
+import static org.onap.vid.testUtils.TestUtils.testWithSystemProperty;
+import static org.testng.AssertJUnit.assertEquals;
+
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
+import java.time.Instant;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.temporal.ChronoUnit;
+import java.util.Arrays;
+import java.util.UUID;
import org.mockito.ArgumentCaptor;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.onap.vid.job.*;
+import org.onap.vid.job.Job;
+import org.onap.vid.job.JobAdapter;
+import org.onap.vid.job.JobType;
+import org.onap.vid.job.JobsBrokerService;
+import org.onap.vid.job.NextCommand;
import org.onap.vid.job.impl.JobSharedData;
import org.onap.vid.model.Action;
import org.onap.vid.model.serviceInstantiation.Network;
import org.testng.annotations.Test;
import org.togglz.core.manager.FeatureManager;
-import java.time.Instant;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
-import java.time.temporal.ChronoUnit;
-import java.util.Arrays;
-import java.util.UUID;
-
-import static java.util.Collections.emptyList;
-import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.containsInAnyOrder;
-import static org.hamcrest.core.Is.is;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.*;
-import static org.onap.vid.job.Job.JobStatus.*;
-import static org.onap.vid.job.command.ResourceCommandKt.*;
-import static org.onap.vid.job.command.ResourceCommandTest.FakeResourceCreator.*;
-import static org.onap.vid.model.Action.Create;
-import static org.onap.vid.testUtils.TestUtils.testWithSystemProperty;
-import static org.testng.AssertJUnit.assertEquals;
-
public class ServiceInProgressStatusCommandTest {
msoResultHandlerService,
jobAdapter,
restMsoImplementation,
- auditService
+ auditService,
+ featureManager
);
}
import org.onap.vid.testUtils.TestUtils.initMockitoMocks
import org.testng.annotations.BeforeMethod
import org.testng.annotations.Test
+import org.togglz.core.manager.FeatureManager
class VfmoduleCommandTest {
@Mock lateinit var watchChildrenJobsBL: WatchChildrenJobsBL;
@Mock lateinit var jobsBrokerService: JobsBrokerService;
@Mock lateinit var jobAdapter: JobAdapter;
+ @Mock lateinit var featureManager: FeatureManager;
+
@InjectMocks lateinit var vfModuleCommand: VfmoduleCommand;