Merge "Merge from ECOMP's repository"

1 files changed, 21 insertions, 3 deletions

diff --git a/vid-app-common/src/main/java/org/onap/vid/job/JobType.java b/vid-app-common/src/main/java/org/onap/vid/job/JobType.java
index 9846d2775..e856ba0d4 100644
--- a/vid-app-common/src/main/java/org/onap/vid/job/JobType.java
+++ b/vid-app-common/src/main/java/org/onap/vid/job/JobType.java
@@ -6,15 +6,33 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static org.onap.vid.utils.Streams.not;
+
 public enum JobType {
 
     HttpCall(HttpCallCommand.class),
     AggregateState(AggregateStateCommand.class),
-    ServiceInstantiation(ServiceInstantiationCommand.class),
-    InProgressStatus(InProgressStatusCommand.class),
+    ServiceInstantiation(MacroServiceInstantiationCommand.class),
+    MacroServiceInstantiation(MacroServiceInstantiationCommand.class),
+    ALaCarteServiceInstantiation(ALaCarteServiceInstantiationCommand.class),
+    ALaCarteService(ALaCarteServiceCommand.class),
+    VnfInstantiation(VnfInstantiationCommand.class),
+    VfmoduleInstantiation(VfmoduleInstantiationCommand.class),
+    VolumeGroupInstantiation(VolumeGroupInstantiationCommand.class),
+    VolumeGroupInProgressStatus(VolumeGroupInProgressStatusCommand.class),
+    NetworkInstantiation(NetworkInstantiationCommand.class),
+    InstanceGroupInstantiation(InstanceGroupInstantiationCommand.class),
+    InstanceGroup(InstanceGroupCommand.class),
+    InProgressStatus(ServiceInProgressStatusCommand.class),
+    ResourceInProgressStatus(ResourceInProgressStatusCommand.class),
+    VnfInProgressStatus(VnfInProgressStatusCommand.class),
+    Watching(WatchingCommand.class),
+    WatchingBaseModule(WatchingCommandBaseModule.class),
     NoOp(NoOpCommand.class);
 
-    private static final Map<Class, JobType> REVERSE_MAP = Stream.of(values()).collect(Collectors.toMap(t -> t.getCommandClass(), t -> t));
+    private static final Map<Class, JobType> REVERSE_MAP = Stream.of(values())
+            .filter(not(jobType -> jobType.equals(ServiceInstantiation)))
+            .collect(Collectors.toMap(t -> t.getCommandClass(), t -> t));
 
     private final Class commandClass;